From 8234c2a6fe52c999ea9405ad224c21e4669d7a16 Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Fri, 20 Jul 2007 09:21:06 +0200 Subject: [PATCH] --- yaml --- r: 62020 b: refs/heads/master c: 5c72fc5cad68f5e1bfe0910cca9f63723e4a5c4a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/fault.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7ecf943af15e..ae5b7bf35b42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dee2383784212c67819fdda1cbd4339f11d23b99 +refs/heads/master: 5c72fc5cad68f5e1bfe0910cca9f63723e4a5c4a diff --git a/trunk/arch/arm/mm/fault.c b/trunk/arch/arm/mm/fault.c index c04124a095cf..846cce48e2b7 100644 --- a/trunk/arch/arm/mm/fault.c +++ b/trunk/arch/arm/mm/fault.c @@ -145,8 +145,8 @@ void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs) __do_kernel_fault(mm, addr, fsr, regs); } -#define VM_FAULT_BADMAP (-20) -#define VM_FAULT_BADACCESS (-21) +#define VM_FAULT_BADMAP 0x010000 +#define VM_FAULT_BADACCESS 0x020000 static int __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) /* * Handle the "normal" case first - VM_FAULT_MAJOR / VM_FAULT_MINOR */ - if (likely(!(fault & VM_FAULT_ERROR))) + if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP | VM_FAULT_BADACCESS)))) return 0; /*