diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-15 07:10:26 +0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-15 07:10:26 +0400 |
commit | 20445cc9159089d9d6b88d7864578efb10eb6590 (patch) | |
tree | fbbb27fd8baa82c77ebc4e020e8ee9ddb57e3ae2 /arch/arm26/mm/fault.c | |
parent | 4339d328631aa815fe2181b9164b3690ca2db4da (diff) | |
parent | 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (diff) | |
download | linux-20445cc9159089d9d6b88d7864578efb10eb6590.tar.xz |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'arch/arm26/mm/fault.c')
-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; } |