diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-25 07:51:46 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-25 07:51:46 -0500 |
| commit | 0b271ef4521756010675b1611bef20fd3096790d (patch) | |
| tree | 2c9d22a2c74122a9904e533df27f41d63ffef394 /arch/powerpc/platforms/cell/spufs/file.c | |
| parent | b19b3c74c7bbec45a848631b8f970ac110665a01 (diff) | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
Merge commit 'v2.6.28' into core/core
Diffstat (limited to 'arch/powerpc/platforms/cell/spufs/file.c')
| -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, | |||
| 390 | if (offset >= ps_size) | 390 | if (offset >= ps_size) |
| 391 | return VM_FAULT_SIGBUS; | 391 | return VM_FAULT_SIGBUS; |
| 392 | 392 | ||
| 393 | if (fatal_signal_pending(current)) | ||
| 394 | return VM_FAULT_SIGBUS; | ||
| 395 | |||
| 393 | /* | 396 | /* |
| 394 | * Because we release the mmap_sem, the context may be destroyed while | 397 | * 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 | 398 | * we're in spu_wait. Grab an extra reference so it isn't destroyed |