aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/fault.c
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2007-07-20 03:21:06 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-20 11:50:20 -0400
commit5c72fc5cad68f5e1bfe0910cca9f63723e4a5c4a (patch)
treead104c86fa58d7871727ba87a6dc214b44d994da /arch/arm/mm/fault.c
parentdee2383784212c67819fdda1cbd4339f11d23b99 (diff)
arm: fix up handle_mm_fault changes
Update arm to use bitwise types for its VM_FAULT_ constants. Signed-off-by: Nick Piggin <npiggin@suse.de> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mm/fault.c')
-rw-r--r--arch/arm/mm/fault.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index c04124a095cf..846cce48e2b7 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -145,8 +145,8 @@ void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
145 __do_kernel_fault(mm, addr, fsr, regs); 145 __do_kernel_fault(mm, addr, fsr, regs);
146} 146}
147 147
148#define VM_FAULT_BADMAP (-20) 148#define VM_FAULT_BADMAP 0x010000
149#define VM_FAULT_BADACCESS (-21) 149#define VM_FAULT_BADACCESS 0x020000
150 150
151static int 151static int
152__do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr, 152__do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
@@ -249,7 +249,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
249 /* 249 /*
250 * Handle the "normal" case first - VM_FAULT_MAJOR / VM_FAULT_MINOR 250 * Handle the "normal" case first - VM_FAULT_MAJOR / VM_FAULT_MINOR
251 */ 251 */
252 if (likely(!(fault & VM_FAULT_ERROR))) 252 if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP | VM_FAULT_BADACCESS))))
253 return 0; 253 return 0;
254 254
255 /* 255 /*