summaryrefslogtreecommitdiff
path: root/arch/alpha/mm/fault.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-06-22 10:24:43 +0200
committerIngo Molnar <mingo@elte.hu>2009-06-22 10:24:43 +0200
commitb7f797cb600fa88de04903be4df3c8a6cb1cb35c (patch)
treefb34c6081f4184cf336d3df2bd0d1c5de98916c1 /arch/alpha/mm/fault.c
parent99bd0c0fc4b04da54cb311953ef9489931c19c63 (diff)
parent0017c869ddcb73069905d09f9e98e68627466237 (diff)
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into x86/urgent
Diffstat (limited to 'arch/alpha/mm/fault.c')
-rw-r--r--arch/alpha/mm/fault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
index 4829f96585b1..00a31deaa96e 100644
--- a/arch/alpha/mm/fault.c
+++ b/arch/alpha/mm/fault.c
@@ -146,7 +146,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
/* If for any reason at all we couldn't handle the fault,
make sure we exit gracefully rather than endlessly redo
the fault. */
- fault = handle_mm_fault(mm, vma, address, cause > 0);
+ fault = handle_mm_fault(mm, vma, address, cause > 0 ? FAULT_FLAG_WRITE : 0);
up_read(&mm->mmap_sem);
if (unlikely(fault & VM_FAULT_ERROR)) {
if (fault & VM_FAULT_OOM)