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/x86/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/x86/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index c403526d5d15..78a5fff857be 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
| @@ -1113,7 +1113,7 @@ good_area: | |||
| 1113 | * make sure we exit gracefully rather than endlessly redo | 1113 | * make sure we exit gracefully rather than endlessly redo |
| 1114 | * the fault: | 1114 | * the fault: |
| 1115 | */ | 1115 | */ |
| 1116 | fault = handle_mm_fault(mm, vma, address, write); | 1116 | fault = handle_mm_fault(mm, vma, address, write ? FAULT_FLAG_WRITE : 0); |
| 1117 | 1117 | ||
| 1118 | if (unlikely(fault & VM_FAULT_ERROR)) { | 1118 | if (unlikely(fault & VM_FAULT_ERROR)) { |
| 1119 | mm_fault_error(regs, error_code, address, fault); | 1119 | mm_fault_error(regs, error_code, address, fault); |