Skip to content

L
linux-davinci-2.6.23
Commit 9d343219 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents ea48e705 ff2afb9d
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
arch/arm/mm/fault.c
View file @ 9d343219
...@@ -238,9 +238,9 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) ...@@ -238,9 +238,9 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
up_read(&mm->mmap_sem); 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; return 0;
/* /*
...@@ -261,7 +261,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) ...@@ -261,7 +261,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
do_exit(SIGKILL); do_exit(SIGKILL);
return 0; return 0;
case 0: case VM_FAULT_SIGBUS:
/* /*
* We had some memory, but were unable to * We had some memory, but were unable to
* successfully fix up this page fault. * successfully fix up this page fault.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment