Hi,
patch attached fixes __FUNCTION__ concatenation for mips arch. No side
effects. Patch against 2.4.18-pre3.
diff -ur -X /home/vkondra-l/lib/dontdiff linux-2.4.18-pre3.orig/arch/mips/kernel/traps.c linux-2.4.18-pre3.patched/arch/mips/kernel/traps.c
--- linux-2.4.18-pre3.orig/arch/mips/kernel/traps.c Sun Sep 9 20:43:01 2001
+++ linux-2.4.18-pre3.patched/arch/mips/kernel/traps.c Fri Jan 11 23:54:42 2002
@@ -191,13 +191,13 @@
spinlock_t die_lock;
extern void __die(const char * str, struct pt_regs * regs, const char *where,
- unsigned long line)
+ const char* func, unsigned long line)
{
console_verbose();
spin_lock_irq(&die_lock);
printk("%s", str);
if (where)
- printk(" in %s, line %ld", where, line);
+ printk(" in %s:%s, line %ld", where, (func ? : "???"), line);
printk(":\n");
show_regs(regs);
printk("Process %s (pid: %d, stackpage=%08lx)\n",
@@ -211,10 +211,10 @@
}
void __die_if_kernel(const char * str, struct pt_regs * regs, const char *where,
- unsigned long line)
+ const char* func, unsigned long line)
{
if (!user_mode(regs))
- __die(str, regs, where, line);
+ __die(str, regs, where, func, line);
}
extern const struct exception_table_entry __start___dbe_table[];
diff -ur -X /home/vkondra-l/lib/dontdiff linux-2.4.18-pre3.orig/include/asm-mips/system.h linux-2.4.18-pre3.patched/include/asm-mips/system.h
--- linux-2.4.18-pre3.orig/include/asm-mips/system.h Sun Sep 9 20:43:01 2001
+++ linux-2.4.18-pre3.patched/include/asm-mips/system.h Sat Jan 12 00:03:07 2002
@@ -252,13 +252,13 @@
extern void *set_except_vector(int n, void *addr);
extern void __die(const char *, struct pt_regs *, const char *where,
- unsigned long line) __attribute__((noreturn));
+ const char* func, unsigned long line) __attribute__((noreturn));
extern void __die_if_kernel(const char *, struct pt_regs *, const char *where,
- unsigned long line);
+ const char* func, unsigned long line);
#define die(msg, regs) \
- __die(msg, regs, __FILE__ ":"__FUNCTION__, __LINE__)
+ __die(msg, regs, __FILE__, __FUNCTION__, __LINE__)
#define die_if_kernel(msg, regs) \
- __die_if_kernel(msg, regs, __FILE__ ":"__FUNCTION__, __LINE__)
+ __die_if_kernel(msg, regs, __FILE__, __FUNCTION__, __LINE__)
#endif /* _ASM_SYSTEM_H */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Tue Jan 15 2002 - 21:00:42 EST