UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Paul Mackerras 2008-11-24 11:54:08 +11:00
parent be542fa56b 606572634c
commit 3f9b5d4dda
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/platforms/cell/spufs/file.c
View File

@ -390,6 +390,9 @@ static int spufs_ps_fault(struct vm_area_struct *vma,
if (offset >= ps_size) if (offset >= ps_size)
return VM_FAULT_SIGBUS; 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 * 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 * we're in spu_wait. Grab an extra reference so it isn't destroyed