summaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-25 13:53:11 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-25 13:53:11 +0100
commitb594deb0cc54d857828d2e33b2e9d5a9f02f0e89 (patch)
tree1ce4e5e96dc2a3970d382ef952bf2683aa8c75a0 /include/asm-generic
parent0b271ef4521756010675b1611bef20fd3096790d (diff)
parentec5679e513305f1411753e5f5489935bd638af23 (diff)
downloadlinux-b594deb0cc54d857828d2e33b2e9d5a9f02f0e89.tar.bz2
Merge branch 'core/debug' into core/core
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/bug.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 12c07c1866b2..b8ba6941f587 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -33,15 +33,14 @@ struct bug_entry {
#ifndef __WARN
#ifndef __ASSEMBLY__
-extern void warn_on_slowpath(const char *file, const int line);
extern void warn_slowpath(const char *file, const int line,
const char *fmt, ...) __attribute__((format(printf, 3, 4)));
#define WANT_WARN_ON_SLOWPATH
#endif
-#define __WARN() warn_on_slowpath(__FILE__, __LINE__)
-#define __WARN_printf(arg...) warn_slowpath(__FILE__, __LINE__, arg)
+#define __WARN() warn_slowpath(__FILE__, __LINE__, NULL)
+#define __WARN_printf(arg...) warn_slowpath(__FILE__, __LINE__, arg)
#else
-#define __WARN_printf(arg...) do { printk(arg); __WARN(); } while (0)
+#define __WARN_printf(arg...) do { printk(arg); __WARN(); } while (0)
#endif
#ifndef WARN_ON