leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't print file name and line in die and die_if_kernel.

Browse Source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2005-10-13 17:07:54 +01:00
parent 6ec25809c1
commit 178086c86a
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/mips/kernel/traps.c
View File

@ -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[];

14
include/asm-mips/system.h
View File

@ -434,15 +434,13 @@ extern void *set_vi_srs_handler (int n, void *addr, int regset);
extern void *set_except_vector(int n, void *addr);
extern void per_cpu_trap_init(void);
extern NORET_TYPE void __die(const char *, struct pt_regs *, const char *file,
const char *func, unsigned long line) ATTRIB_NORET;
extern void __die_if_kernel(const char *, struct pt_regs *, const char *file,
const char *func, unsigned long line);
extern NORET_TYPE void die(const char *, struct pt_regs *);
#define die(msg, regs) \
__die(msg, regs, __FILE__ ":", __FUNCTION__, __LINE__)
#define die_if_kernel(msg, regs) \
__die_if_kernel(msg, regs, __FILE__ ":", __FUNCTION__, __LINE__)
static inline void die_if_kernel(const char *str, struct pt_regs *regs)
{
if (unlikely(!user_mode(regs)))
die(str, regs);
}
extern int stop_a_enabled;