GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-15 11:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Linus Torvalds 2005-08-04 09:30:50 -07:00
commit 9d343219e3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mm/fault.c
View file

@ -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)
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.