diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-22 04:24:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-22 04:24:43 -0400 |
| commit | b7f797cb600fa88de04903be4df3c8a6cb1cb35c (patch) | |
| tree | fb34c6081f4184cf336d3df2bd0d1c5de98916c1 /arch/cris/mm/fault.c | |
| parent | 99bd0c0fc4b04da54cb311953ef9489931c19c63 (diff) | |
| parent | 0017c869ddcb73069905d09f9e98e68627466237 (diff) | |
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into x86/urgent
Diffstat (limited to 'arch/cris/mm/fault.c')
| -rw-r--r-- | arch/cris/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c index c4c76db90f9c..f925115e3250 100644 --- a/arch/cris/mm/fault.c +++ b/arch/cris/mm/fault.c | |||
| @@ -163,7 +163,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs, | |||
| 163 | * the fault. | 163 | * the fault. |
| 164 | */ | 164 | */ |
| 165 | 165 | ||
| 166 | fault = handle_mm_fault(mm, vma, address, writeaccess & 1); | 166 | fault = handle_mm_fault(mm, vma, address, (writeaccess & 1) ? FAULT_FLAG_WRITE : 0); |
| 167 | if (unlikely(fault & VM_FAULT_ERROR)) { | 167 | if (unlikely(fault & VM_FAULT_ERROR)) { |
| 168 | if (fault & VM_FAULT_OOM) | 168 | if (fault & VM_FAULT_OOM) |
| 169 | goto out_of_memory; | 169 | goto out_of_memory; |