git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
arch
/
um
/
kernel
/
trap.c
diff --git
a/arch/um/kernel/trap.c
b/arch/um/kernel/trap.c
index
7384d8a
..
637c650
100644
(file)
--- a/
arch/um/kernel/trap.c
+++ b/
arch/um/kernel/trap.c
@@
-65,7
+65,7
@@
good_area:
do {
int fault;
- fault = handle_mm_fault(mm, vma, address, is_write);
+ fault = handle_mm_fault(mm, vma, address, is_write
? FAULT_FLAG_WRITE : 0
);
if (unlikely(fault & VM_FAULT_ERROR)) {
if (fault & VM_FAULT_OOM) {
goto out_of_memory;