diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 02:54:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-09 02:54:55 +0000 |
| commit | 493c987f7a352ca64fdb4dc03a21e24cbaf46f55 (patch) | |
| tree | 184cddc0925e082c0500afd042f92e9f340fe890 /arch/sparc | |
| parent | 2d25612a92c62b5708d6d43f38d28c6141173328 (diff) | |
Merge with Linux 2.4.0-pre3-test6.
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/signal.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/signal.c b/arch/sparc/kernel/signal.c index 8ff82dd7e..bcad13dbc 100644 --- a/arch/sparc/kernel/signal.c +++ b/arch/sparc/kernel/signal.c @@ -1,4 +1,4 @@ -/* $Id: signal.c,v 1.105 2000/06/19 06:24:37 davem Exp $ +/* $Id: signal.c,v 1.106 2000/07/07 04:25:17 davem Exp $ * linux/arch/sparc/kernel/signal.c * * Copyright (C) 1991, 1992 Linus Torvalds @@ -1282,7 +1282,6 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs * regs, #endif /* fall through */ default: - lock_kernel(); sigaddset(¤t->signal, signr); recalc_sigpending(current); current->flags |= PF_SIGNALED; |