Commit 3f9b5d4d authored by Paul Mackerras's avatar Paul Mackerras

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

parents be542fa5 60657263
...@@ -390,6 +390,9 @@ static int spufs_ps_fault(struct vm_area_struct *vma, ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment