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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
frv
/
mm
/
fault.c
diff --git
a/arch/frv/mm/fault.c
b/arch/frv/mm/fault.c
index
41d02ac
..
3f12296
100644
(file)
--- a/
arch/frv/mm/fault.c
+++ b/
arch/frv/mm/fault.c
@@
-78,7
+78,7
@@
asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
* If we're in an interrupt or have no user
* context, we must not take the fault..
*/
* If we're in an interrupt or have no user
* context, we must not take the fault..
*/
- if (in_
interrupt
() || !mm)
+ if (in_
atomic
() || !mm)
goto no_context;
down_read(&mm->mmap_sem);
goto no_context;
down_read(&mm->mmap_sem);
@@
-163,13
+163,13
@@
asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
* the fault.
*/
switch (handle_mm_fault(mm, vma, ear0, write)) {
* the fault.
*/
switch (handle_mm_fault(mm, vma, ear0, write)) {
- case
1
:
+ case
VM_FAULT_MINOR
:
current->min_flt++;
break;
current->min_flt++;
break;
- case
2
:
+ case
VM_FAULT_MAJOR
:
current->maj_flt++;
break;
current->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;