diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-23 19:54:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-23 19:54:08 -0500 |
| commit | 3f9b5d4dda6d85aab33fef32e8351ddc34c81fb4 (patch) | |
| tree | b3295e66c18503be9fd6d4e59964ecf32296e177 /arch | |
| parent | be542fa56b1b5b269a70b4df219d0cbd871f16d2 (diff) | |
| parent | 606572634c3faa5b32a8fc430266e6e9d78d2179 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into merge
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/file.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c index b73c369cc6f1..1b26071a86ca 100644 --- a/arch/powerpc/platforms/cell/spufs/file.c +++ b/arch/powerpc/platforms/cell/spufs/file.c | |||
| @@ -390,6 +390,9 @@ static int spufs_ps_fault(struct vm_area_struct *vma, | |||
| 390 | if (offset >= ps_size) | 390 | if (offset >= ps_size) |
| 391 | return VM_FAULT_SIGBUS; | 391 | return VM_FAULT_SIGBUS; |
| 392 | 392 | ||
| 393 | if (fatal_signal_pending(current)) | ||
| 394 | return VM_FAULT_SIGBUS; | ||
| 395 | |||
| 393 | /* | 396 | /* |
| 394 | * Because we release the mmap_sem, the context may be destroyed while | 397 | * Because we release the mmap_sem, the context may be destroyed while |
| 395 | * we're in spu_wait. Grab an extra reference so it isn't destroyed | 398 | * we're in spu_wait. Grab an extra reference so it isn't destroyed |