git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Manual merge with Linus.
[sfrench/cifs-2.6.git]
/
arch
/
cris
/
mm
/
fault.c
diff --git
a/arch/cris/mm/fault.c
b/arch/cris/mm/fault.c
index fe1cc36b5aca0d31914c599938dac1994e7ea07b..934c51078ccee4bafca2b68b7752b1745a63ee03 100644
(file)
--- a/
arch/cris/mm/fault.c
+++ b/
arch/cris/mm/fault.c
@@
-284,13
+284,13
@@
do_page_fault(unsigned long address, struct pt_regs *regs,
*/
switch (handle_mm_fault(mm, vma, address, writeaccess & 1)) {
*/
switch (handle_mm_fault(mm, vma, address, writeaccess & 1)) {
- case
1
:
+ case
VM_FAULT_MINOR
:
tsk->min_flt++;
break;
tsk->min_flt++;
break;
- case
2
:
+ case
VM_FAULT_MAJOR
:
tsk->maj_flt++;
break;
tsk->maj_flt++;
break;
- case
0
:
+ case
VM_FAULT_SIGBUS
:
goto do_sigbus;
default:
goto out_of_memory;
goto do_sigbus;
default:
goto out_of_memory;