diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-04 12:30:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-04 12:30:50 -0400 |
| commit | 9d343219e33e8b49d754ea9b2e45f6c7da87f4fb (patch) | |
| tree | 7071539fb438f624aa2ad737de380bacdcf2b572 /arch | |
| parent | ea48e705be4f886c16313c882a6623b442bab0eb (diff) | |
| parent | ff2afb9df607dfcaacdaf67ea84b773c6fb08f4c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch')
| -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) | |||
| 238 | up_read(&mm->mmap_sem); | 238 | up_read(&mm->mmap_sem); |
| 239 | 239 | ||
| 240 | /* | 240 | /* |
| 241 | * Handle the "normal" case first | 241 | * Handle the "normal" case first - VM_FAULT_MAJOR / VM_FAULT_MINOR |
| 242 | */ | 242 | */ |
| 243 | if (fault > 0) | 243 | if (fault >= VM_FAULT_MINOR) |
| 244 | return 0; | 244 | return 0; |
| 245 | 245 | ||
| 246 | /* | 246 | /* |
| @@ -261,7 +261,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) | |||
| 261 | do_exit(SIGKILL); | 261 | do_exit(SIGKILL); |
| 262 | return 0; | 262 | return 0; |
| 263 | 263 | ||
| 264 | case 0: | 264 | case VM_FAULT_SIGBUS: |
| 265 | /* | 265 | /* |
| 266 | * We had some memory, but were unable to | 266 | * We had some memory, but were unable to |
| 267 | * successfully fix up this page fault. | 267 | * successfully fix up this page fault. |