diff options
| author | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
|---|---|---|
| committer | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
| commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
| tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /arch/mips/kernel | |
| parent | 6d376756f2cf3478d5a4fdb8d18e958948366b9d (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge /scratch/Ksrc/linux-git/
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/irixsig.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/signal32.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c index 3f956f809fa4..40244782a8e5 100644 --- a/arch/mips/kernel/irixsig.c +++ b/arch/mips/kernel/irixsig.c | |||
| @@ -178,7 +178,7 @@ asmlinkage int do_irix_signal(sigset_t *oldset, struct pt_regs *regs) | |||
| 178 | if (!user_mode(regs)) | 178 | if (!user_mode(regs)) |
| 179 | return 1; | 179 | return 1; |
| 180 | 180 | ||
| 181 | if (try_to_freeze(0)) | 181 | if (try_to_freeze()) |
| 182 | goto no_signal; | 182 | goto no_signal; |
| 183 | 183 | ||
| 184 | if (!oldset) | 184 | if (!oldset) |
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c index 1f3b19124c01..c1a69cf232f9 100644 --- a/arch/mips/kernel/signal32.c +++ b/arch/mips/kernel/signal32.c | |||
| @@ -774,7 +774,7 @@ int do_signal32(sigset_t *oldset, struct pt_regs *regs) | |||
| 774 | if (!user_mode(regs)) | 774 | if (!user_mode(regs)) |
| 775 | return 1; | 775 | return 1; |
| 776 | 776 | ||
| 777 | if (try_to_freeze(0)) | 777 | if (try_to_freeze()) |
| 778 | goto no_signal; | 778 | goto no_signal; |
| 779 | 779 | ||
| 780 | if (!oldset) | 780 | if (!oldset) |