From: Nick Piggin Date: Fri, 20 Jul 2007 07:21:06 +0000 (+0200) Subject: arm: fix up handle_mm_fault changes X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5c72fc5cad68f5e1bfe0910cca9f63723e4a5c4a;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git arm: fix up handle_mm_fault changes Update arm to use bitwise types for its VM_FAULT_ constants. Signed-off-by: Nick Piggin Cc: Russell King Signed-off-by: Linus Torvalds --- diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index c04124a095c..846cce48e2b 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) __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; /*