diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-04 09:30:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-04 09:30:50 -0700 |
| commit | 9d343219e33e8b49d754ea9b2e45f6c7da87f4fb (patch) | |
| tree | 7071539fb438f624aa2ad737de380bacdcf2b572 | |
| parent | Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband (diff) | |
| parent | [PATCH] ARM: Fix ARM fault handler for get_user_pages() fixes. (diff) | |
| download | linux-dev-9d343219e33e8b49d754ea9b2e45f6c7da87f4fb.tar.xz linux-dev-9d343219e33e8b49d754ea9b2e45f6c7da87f4fb.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
| -rw-r--r-- | arch/arm/mm/fault.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 65bfe84b6d67..0b6c4db44e08 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -238,9 +238,9 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) up_read(&mm->mmap_sem); /* - * Handle the "normal" case first + * Handle the "normal" case first - VM_FAULT_MAJOR / VM_FAULT_MINOR */ - if (fault > 0) + if (fault >= VM_FAULT_MINOR) return 0; /* @@ -261,7 +261,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) do_exit(SIGKILL); return 0; - case 0: + case VM_FAULT_SIGBUS: /* * We had some memory, but were unable to * successfully fix up this page fault. |