summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/unaligned.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-12-04 03:58:56 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-12-04 03:58:56 +0000
commit1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch)
tree357efc7b93f8f5102110d20d293f41360ec212fc /arch/mips/kernel/unaligned.c
parentaea27b2e18d69af87e673972246e66657b4fa274 (diff)
Merge with Linux 2.3.21.
Diffstat (limited to 'arch/mips/kernel/unaligned.c')
-rw-r--r--arch/mips/kernel/unaligned.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 591c1a47b..2520b4e34 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -1,4 +1,5 @@
-/*
+/* $Id: unaligned.c,v 1.8 1999/10/10 18:49:15 ralf Exp $
+ *
* Handle unaligned accesses by emulation.
*
* This file is subject to the terms and conditions of the GNU General Public
@@ -7,7 +8,7 @@
*
* Copyright (C) 1996, 1998 by Ralf Baechle
*
- * $Id: unaligned.c,v 1.5 1999/05/01 22:40:39 ralf Exp $
+ * $Id: unaligned.c,v 1.6 1999/10/09 00:00:58 ralf Exp $
*
* This file contains exception handler for address error exception with the
* special capability to execute faulting instructions in software. The
@@ -365,19 +366,13 @@ fault:
return;
}
- lock_kernel();
send_sig(SIGSEGV, current, 1);
- unlock_kernel();
return;
sigbus:
- lock_kernel();
send_sig(SIGBUS, current, 1);
- unlock_kernel();
return;
sigill:
- lock_kernel();
send_sig(SIGILL, current, 1);
- unlock_kernel();
return;
}
@@ -407,9 +402,7 @@ asmlinkage void do_ade(struct pt_regs *regs)
return;
sigbus:
- lock_kernel();
force_sig(SIGBUS, current);
- unlock_kernel();
return;
}