diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-05-12 14:53:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-05-12 14:53:40 +0800 |
| commit | 8134585f1c33565ea5e752a7ba9323ed3e0921f3 (patch) | |
| tree | 1fd22479884783bb498702169de744b513dd68f7 /arch/powerpc/platforms/cell/spu_fault.c | |
| parent | 05f74e8baccb60882ace4d0165887368e8143f3f (diff) | |
| parent | 9182148a5315d4b1de68ac74fd54cbb5da5a3703 (diff) | |
Merge tag 'v3.10.77' into linux-linaro-lsk
This is the 3.10.77 stable release
Conflicts:
drivers/video/console/Kconfig
scripts/kconfig/menu.c
Diffstat (limited to 'arch/powerpc/platforms/cell/spu_fault.c')
| -rw-r--r-- | arch/powerpc/platforms/cell/spu_fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/spu_fault.c b/arch/powerpc/platforms/cell/spu_fault.c index 641e7273d75a..62f3e4e48a0b 100644 --- a/arch/powerpc/platforms/cell/spu_fault.c +++ b/arch/powerpc/platforms/cell/spu_fault.c @@ -75,7 +75,7 @@ int spu_handle_mm_fault(struct mm_struct *mm, unsigned long ea, if (*flt & VM_FAULT_OOM) { ret = -ENOMEM; goto out_unlock; - } else if (*flt & VM_FAULT_SIGBUS) { + } else if (*flt & (VM_FAULT_SIGBUS | VM_FAULT_SIGSEGV)) { ret = -EFAULT; goto out_unlock; } |