summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2005-10-13 17:07:54 +0100
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 19:32:42 +0100
commit178086c86ac9738a76f1462e9ee4cbe8fd3b8c51 (patch)
tree7981d13e3037b51acfe83b7280804ea73c6b7013 /arch/mips
parent6ec25809c143d875ed17b2e85d1dd894a1f4aba4 (diff)
downloadop-kernel-dev-178086c86ac9738a76f1462e9ee4cbe8fd3b8c51.zip
op-kernel-dev-178086c86ac9738a76f1462e9ee4cbe8fd3b8c51.tar.gz
Don't print file name and line in die and die_if_kernel.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/kernel/traps.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index eccae81..a3c0051 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -276,30 +276,18 @@ void show_registers(struct pt_regs *regs)
static DEFINE_SPINLOCK(die_lock);
-NORET_TYPE void ATTRIB_NORET __die(const char * str, struct pt_regs * regs,
- const char * file, const char * func,
- unsigned long line)
+NORET_TYPE void ATTRIB_NORET die(const char * str, struct pt_regs * regs)
{
static int die_counter;
console_verbose();
spin_lock_irq(&die_lock);
- printk("%s", str);
- if (file && func)
- printk(" in %s:%s, line %ld", file, func, line);
- printk("[#%d]:\n", ++die_counter);
+ printk("%s[#%d]:\n", str, ++die_counter);
show_registers(regs);
spin_unlock_irq(&die_lock);
do_exit(SIGSEGV);
}
-void __die_if_kernel(const char * str, struct pt_regs * regs,
- const char * file, const char * func, unsigned long line)
-{
- if (!user_mode(regs))
- __die(str, regs, file, func, line);
-}
-
extern const struct exception_table_entry __start___dbe_table[];
extern const struct exception_table_entry __stop___dbe_table[];
OpenPOWER on IntegriCloud