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/s390/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/s390/mm/fault.c')
| -rw-r--r-- | arch/s390/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 220a152c836c..74eb26bf1970 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c | |||
| @@ -352,7 +352,7 @@ good_area: | |||
| 352 | * make sure we exit gracefully rather than endlessly redo | 352 | * make sure we exit gracefully rather than endlessly redo |
| 353 | * the fault. | 353 | * the fault. |
| 354 | */ | 354 | */ |
| 355 | fault = handle_mm_fault(mm, vma, address, write); | 355 | fault = handle_mm_fault(mm, vma, address, write ? FAULT_FLAG_WRITE : 0); |
| 356 | if (unlikely(fault & VM_FAULT_ERROR)) { | 356 | if (unlikely(fault & VM_FAULT_ERROR)) { |
| 357 | if (fault & VM_FAULT_OOM) { | 357 | if (fault & VM_FAULT_OOM) { |
| 358 | up_read(&mm->mmap_sem); | 358 | up_read(&mm->mmap_sem); |