tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into merge

Paul Mackerras 3f9b5d4d be542fa5

+3
unified split
+3
arch/powerpc/platforms/cell/spufs/file.c
··· 390 if (offset >= ps_size) 391 return VM_FAULT_SIGBUS; 392 393 /* 394 * 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
··· 390 if (offset >= ps_size) 391 return VM_FAULT_SIGBUS; 392 393 + if (fatal_signal_pending(current)) 394 + return VM_FAULT_SIGBUS; 395 + 396 /* 397 * Because we release the mmap_sem, the context may be destroyed while 398 * we're in spu_wait. Grab an extra reference so it isn't destroyed