diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-04 08:33:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-04 08:33:38 -0700 |
| commit | 6e346228c76506e07e297744a28464022c6806ad (patch) | |
| tree | f2c484ca4408d12411bff11dd1fa9627108b12c8 /arch/arm26 | |
| parent | [PATCH] x86-64: use proper VM_FAULT_xxx macros (diff) | |
| download | linux-dev-6e346228c76506e07e297744a28464022c6806ad.tar.xz linux-dev-6e346228c76506e07e297744a28464022c6806ad.zip | |
It wasn't just x86-64 that had hardcoded VM_FAULT_xxx numbers
Fix up arm26, cris, frv, m68k, parisc and sh64 too..
Diffstat (limited to 'arch/arm26')
| -rw-r--r-- | arch/arm26/mm/fault.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/arch/arm26/mm/fault.c b/arch/arm26/mm/fault.c index dacca8bb7744..bd6f2db608b7 100644 --- a/arch/arm26/mm/fault.c +++ b/arch/arm26/mm/fault.c @@ -176,12 +176,12 @@ survive: * Handle the "normal" cases first - successful and sigbus */ switch (fault) { - case 2: + case VM_FAULT_MAJOR: tsk->maj_flt++; return fault; - case 1: + case VM_FAULT_MINOR: tsk->min_flt++; - case 0: + case VM_FAULT_SIGBUS: return fault; } @@ -226,14 +226,11 @@ int do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) /* * Handle the "normal" case first */ - if (fault > 0) + switch (fault) { + case VM_FAULT_MINOR: + case VM_FAULT_MAJOR: return 0; - - /* - * We had some memory, but were unable to - * successfully fix up this page fault. - */ - if (fault == 0){ + case VM_FAULT_SIGBUS: goto do_sigbus; } |