aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@infradead.org>2008-01-30 07:32:50 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:32:50 -0500
commit79b4cc5ee7a8086ac2c9c0afa52e6d687ce1ffef (patch)
tree8f22bbdb0d1532ec6f70400db17bbe2f7c8fbb99 /kernel
parent3a6a62f96f168d192fb0cc9c0b5ee2584740b32d (diff)
debug: move WARN_ON() out of line
A quick grep shows that there are currently 1145 instances of WARN_ON in the kernel. Currently, WARN_ON is pretty much entirely inlined, which makes it hard to enhance it without growing the size of the kernel (and getting Andrew unhappy). This patch build on top of Olof's patch that introduces __WARN, and places the slowpath out of line. It also uses Ingo's suggestion to not use __FUNCTION__ but to use kallsyms to do the lookup; this saves a ton of extra space since gcc doesn't need to store the function string twice now: 3936367 833603 624736 5394706 525112 vmlinux.before 3917508 833603 624736 5375847 520767 vmlinux-slowpath 15Kb savings... Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> CC: Andrew Morton <akpm@linux-foundation.org> CC: Olof Johansson <olof@lixom.net> Acked-by: Matt Meckall <mpm@selenic.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/panic.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index da4d6bac270e..0ebea438278a 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -20,6 +20,7 @@
20#include <linux/kexec.h> 20#include <linux/kexec.h>
21#include <linux/debug_locks.h> 21#include <linux/debug_locks.h>
22#include <linux/random.h> 22#include <linux/random.h>
23#include <linux/kallsyms.h>
23 24
24int panic_on_oops; 25int panic_on_oops;
25int tainted; 26int tainted;
@@ -292,6 +293,20 @@ void oops_exit(void)
292 (unsigned long long)oops_id); 293 (unsigned long long)oops_id);
293} 294}
294 295
296#ifdef WANT_WARN_ON_SLOWPATH
297void warn_on_slowpath(const char *file, int line)
298{
299 char function[KSYM_SYMBOL_LEN];
300 unsigned long caller = (unsigned long) __builtin_return_address(0);
301
302 sprint_symbol(function, caller);
303 printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file,
304 line, function);
305 dump_stack();
306}
307EXPORT_SYMBOL(warn_on_slowpath);
308#endif
309
295#ifdef CONFIG_CC_STACKPROTECTOR 310#ifdef CONFIG_CC_STACKPROTECTOR
296/* 311/*
297 * Called when gcc's -fstack-protector feature is used, and 312 * Called when gcc's -fstack-protector feature is used, and