diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-24 01:54:08 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-24 01:54:08 +0100 |
| commit | 3f9b5d4dda6d85aab33fef32e8351ddc34c81fb4 (patch) | |
| tree | b3295e66c18503be9fd6d4e59964ecf32296e177 | |
| parent | Merge branch 'merge' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwbo... (diff) | |
| parent | powerpc/spufs: Fix spinning in spufs_ps_fault on signal (diff) | |
| download | linux-3f9b5d4dda6d85aab33fef32e8351ddc34c81fb4.tar.xz linux-3f9b5d4dda6d85aab33fef32e8351ddc34c81fb4.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into merge
| -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, if (offset >= ps_size) return VM_FAULT_SIGBUS; + if (fatal_signal_pending(current)) + return VM_FAULT_SIGBUS; + /* * Because we release the mmap_sem, the context may be destroyed while * we're in spu_wait. Grab an extra reference so it isn't destroyed |