git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
arm26
/
mm
/
fault.c
diff --git
a/arch/arm26/mm/fault.c
b/arch/arm26/mm/fault.c
index
dacca8b
..
bd6f2db
100644
(file)
--- 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) {
* Handle the "normal" cases first - successful and sigbus
*/
switch (fault) {
- case
2
:
+ case
VM_FAULT_MAJOR
:
tsk->maj_flt++;
return fault;
tsk->maj_flt++;
return fault;
- case
1
:
+ case
VM_FAULT_MINOR
:
tsk->min_flt++;
tsk->min_flt++;
- case
0
:
+ case
VM_FAULT_SIGBUS
:
return fault;
}
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
*/
/*
* Handle the "normal" case first
*/
- if (fault > 0)
+ switch (fault) {
+ case VM_FAULT_MINOR:
+ case VM_FAULT_MAJOR:
return 0;
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;
}
goto do_sigbus;
}