diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-04 01:58:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 01:58:29 -0500 |
| commit | 8f4bf4bcc4d6f70a47baec5d73bd411e572842e0 (patch) | |
| tree | 8ed86ebd19c32a629bfcfb43378bf32acd14c7d6 /arch/powerpc/mm/copro_fault.c | |
| parent | 1ed39bac21c3c2934b18de34df9478ad7b8edf1f (diff) | |
| parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
Merge tag 'v3.19-rc7' into perf/core, to merge fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/mm/copro_fault.c')
| -rw-r--r-- | arch/powerpc/mm/copro_fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/copro_fault.c b/arch/powerpc/mm/copro_fault.c index 5a236f082c78..1b5305d4bdab 100644 --- a/arch/powerpc/mm/copro_fault.c +++ b/arch/powerpc/mm/copro_fault.c | |||
| @@ -76,7 +76,7 @@ int copro_handle_mm_fault(struct mm_struct *mm, unsigned long ea, | |||
| 76 | if (*flt & VM_FAULT_OOM) { | 76 | if (*flt & VM_FAULT_OOM) { |
| 77 | ret = -ENOMEM; | 77 | ret = -ENOMEM; |
| 78 | goto out_unlock; | 78 | goto out_unlock; |
| 79 | } else if (*flt & VM_FAULT_SIGBUS) { | 79 | } else if (*flt & (VM_FAULT_SIGBUS | VM_FAULT_SIGSEGV)) { |
| 80 | ret = -EFAULT; | 80 | ret = -EFAULT; |
| 81 | goto out_unlock; | 81 | goto out_unlock; |
| 82 | } | 82 | } |