diff options
-rw-r--r-- | include/asm-generic/bug.h | 7 | ||||
-rw-r--r-- | kernel/panic.c | 6 |
2 files changed, 3 insertions, 10 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 { | |||
33 | 33 | ||
34 | #ifndef __WARN | 34 | #ifndef __WARN |
35 | #ifndef __ASSEMBLY__ | 35 | #ifndef __ASSEMBLY__ |
36 | extern void warn_on_slowpath(const char *file, const int line); | ||
37 | extern void warn_slowpath(const char *file, const int line, | 36 | extern void warn_slowpath(const char *file, const int line, |
38 | const char *fmt, ...) __attribute__((format(printf, 3, 4))); | 37 | const char *fmt, ...) __attribute__((format(printf, 3, 4))); |
39 | #define WANT_WARN_ON_SLOWPATH | 38 | #define WANT_WARN_ON_SLOWPATH |
40 | #endif | 39 | #endif |
41 | #define __WARN() warn_on_slowpath(__FILE__, __LINE__) | 40 | #define __WARN() warn_slowpath(__FILE__, __LINE__, NULL) |
42 | #define __WARN_printf(arg...) warn_slowpath(__FILE__, __LINE__, arg) | 41 | #define __WARN_printf(arg...) warn_slowpath(__FILE__, __LINE__, arg) |
43 | #else | 42 | #else |
44 | #define __WARN_printf(arg...) do { printk(arg); __WARN(); } while (0) | 43 | #define __WARN_printf(arg...) do { printk(arg); __WARN(); } while (0) |
45 | #endif | 44 | #endif |
46 | 45 | ||
47 | #ifndef WARN_ON | 46 | #ifndef WARN_ON |
diff --git a/kernel/panic.c b/kernel/panic.c index 73d365199c3f..50349a41fba7 100644 --- a/kernel/panic.c +++ b/kernel/panic.c | |||
@@ -349,12 +349,6 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...) | |||
349 | add_taint(TAINT_WARN); | 349 | add_taint(TAINT_WARN); |
350 | } | 350 | } |
351 | EXPORT_SYMBOL(warn_slowpath); | 351 | EXPORT_SYMBOL(warn_slowpath); |
352 | |||
353 | void warn_on_slowpath(const char *file, int line) | ||
354 | { | ||
355 | warn_slowpath(file, line, NULL); | ||
356 | } | ||
357 | EXPORT_SYMBOL(warn_on_slowpath); | ||
358 | #endif | 352 | #endif |
359 | 353 | ||
360 | #ifdef CONFIG_CC_STACKPROTECTOR | 354 | #ifdef CONFIG_CC_STACKPROTECTOR |