Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not

-Werror clean.

3 files changed, 5 insertions, 16 deletions

diff --git a/arch/mips64/kernel/signal.c b/arch/mips64/kernel/signal.c
index 8252d8a1c..7250885ee 100644
--- a/arch/mips64/kernel/signal.c
+++ b/arch/mips64/kernel/signal.c
@@ -1,5 +1,4 @@
-/* $Id: signal.c,v 1.4 2000/01/17 23:32:46 ralf Exp $
- *
+/*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
@@ -696,7 +695,6 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
 				/* FALLTHRU */
 
 			default:
-				lock_kernel();
 				sigaddset(&current->signal, signr);
 				recalc_sigpending(current);
 				current->flags |= PF_SIGNALED;
diff --git a/arch/mips64/kernel/signal32.c b/arch/mips64/kernel/signal32.c
index 3fc21d31f..7bad6a10b 100644
--- a/arch/mips64/kernel/signal32.c
+++ b/arch/mips64/kernel/signal32.c
@@ -1,5 +1,4 @@
-/* $Id: signal32.c,v 1.4 2000/03/15 22:46:55 kanoj Exp $
- *
+/*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
@@ -771,7 +770,6 @@ printk("%s: delivering signal.\n", current->comm);
 				/* FALLTHRU */
 
 			default:
-				lock_kernel();
 				sigaddset(&current->signal, signr);
 				recalc_sigpending(current);
 				current->flags |= PF_SIGNALED;
diff --git a/arch/mips64/kernel/traps.c b/arch/mips64/kernel/traps.c
index f5346da1e..f9b322534 100644
--- a/arch/mips64/kernel/traps.c
+++ b/arch/mips64/kernel/traps.c
@@ -1,5 +1,4 @@
-/* $Id: traps.c,v 1.4 2000/01/20 23:50:27 ralf Exp $
- *
+/*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
@@ -241,7 +240,6 @@ void do_fpe(struct pt_regs *regs, unsigned long fcr31)
 		return;
 	}
 #endif
-	lock_kernel();
 	if (fcr31 & 0x20000) {
 		/* Retry instruction with flush to zero ...  */
 		if (!(fcr31 & (1<<24))) {
@@ -253,7 +251,7 @@ void do_fpe(struct pt_regs *regs, unsigned long fcr31)
 				"ctc1\t%0,$31"
 				: /* No outputs */
 				: "r" (fcr31));
-			goto out;
+			return;
 		}
 		pc = regs->cp0_epc + ((regs->cp0_cause & CAUSEF_BD) ? 4 : 0);
 		if (get_user(insn, (unsigned int *)pc)) {
@@ -267,12 +265,9 @@ void do_fpe(struct pt_regs *regs, unsigned long fcr31)
 	}
 
 	if (compute_return_epc(regs))
-		goto out;
+		return;
 	//force_sig(SIGFPE, current);
 	printk(KERN_DEBUG "Should send SIGFPE to %s\n", current->comm);
-
-out:
-	unlock_kernel();
 }
 
 static inline int get_insn_opcode(struct pt_regs *regs, unsigned int *opcode)
@@ -331,11 +326,9 @@ void do_tr(struct pt_regs *regs)
 
 void do_ri(struct pt_regs *regs)
 {
-	lock_kernel();
 	printk("Cpu%d[%s:%ld] Illegal instruction at %08lx ra=%08lx\n",
 	        smp_processor_id(), current->comm, current->pid, regs->cp0_epc, 
 		regs->regs[31]);
-	unlock_kernel();
 	if (compute_return_epc(regs))
 		return;
 	force_sig(SIGILL, current);