diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
| commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
| tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /arch/arm/kernel/signal.c | |
| parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/arm/kernel/signal.c')
| -rw-r--r-- | arch/arm/kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 07ddeed61766..5e435e42dacd 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c | |||
| @@ -697,7 +697,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall) | |||
| 697 | if (!user_mode(regs)) | 697 | if (!user_mode(regs)) |
| 698 | return 0; | 698 | return 0; |
| 699 | 699 | ||
| 700 | if (try_to_freeze(0)) | 700 | if (try_to_freeze()) |
| 701 | goto no_signal; | 701 | goto no_signal; |
| 702 | 702 | ||
| 703 | if (current->ptrace & PT_SINGLESTEP) | 703 | if (current->ptrace & PT_SINGLESTEP) |