patch-2.2.11 linux/arch/sparc/mm/fault.c
Next file: linux/arch/sparc/mm/init.c
Previous file: linux/arch/sparc/math-emu/sfp-machine.h
Back to the patch index
Back to the overall index
- Lines: 30
- Date:
Mon Aug 9 12:05:09 1999
- Orig file:
v2.2.10/linux/arch/sparc/mm/fault.c
- Orig date:
Wed Mar 10 16:53:36 1999
diff -u --recursive --new-file v2.2.10/linux/arch/sparc/mm/fault.c linux/arch/sparc/mm/fault.c
@@ -1,4 +1,4 @@
-/* $Id: fault.c,v 1.101 1999/01/04 06:24:52 jj Exp $
+/* $Id: fault.c,v 1.101.2.2 1999/08/07 10:42:53 davem Exp $
* fault.c: Page fault handlers for the Sparc.
*
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -17,7 +17,6 @@
#include <linux/smp.h>
#include <linux/signal.h>
#include <linux/mm.h>
-#include <linux/smp.h>
#include <linux/smp_lock.h>
#include <linux/interrupt.h>
@@ -383,12 +382,13 @@
if(expand_stack(vma, address))
goto bad_area;
good_area:
- if(write)
+ if(write) {
if(!(vma->vm_flags & VM_WRITE))
goto bad_area;
- else
+ } else {
if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
goto bad_area;
+ }
if (!handle_mm_fault(current, vma, address, write))
goto do_sigbus;
up(&mm->mmap_sem);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)