Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

…/jk/spufs into merge
mariux64 · Nov 24, 2008 · 3f9b5d4 · 3f9b5d4
2 parents be542fa + 6065726
commit 3f9b5d4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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