diff options
Diffstat (limited to 'kernel/panic.c')
| -rw-r--r-- | kernel/panic.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 3dcaa166135..874ecf1307a 100644 --- a/kernel/panic.c +++ b/kernel/panic.c | |||
| @@ -340,7 +340,7 @@ void oops_exit(void) | |||
| 340 | } | 340 | } |
| 341 | 341 | ||
| 342 | #ifdef WANT_WARN_ON_SLOWPATH | 342 | #ifdef WANT_WARN_ON_SLOWPATH |
| 343 | void warn_slowpath(const char *file, int line, const char *fmt, ...) | 343 | void warn_slowpath_fmt(const char *file, int line, const char *fmt, ...) |
| 344 | { | 344 | { |
| 345 | va_list args; | 345 | va_list args; |
| 346 | char function[KSYM_SYMBOL_LEN]; | 346 | char function[KSYM_SYMBOL_LEN]; |
| @@ -356,7 +356,7 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...) | |||
| 356 | if (board) | 356 | if (board) |
| 357 | printk(KERN_WARNING "Hardware name: %s\n", board); | 357 | printk(KERN_WARNING "Hardware name: %s\n", board); |
| 358 | 358 | ||
| 359 | if (fmt) { | 359 | if (*fmt) { |
| 360 | va_start(args, fmt); | 360 | va_start(args, fmt); |
| 361 | vprintk(fmt, args); | 361 | vprintk(fmt, args); |
| 362 | va_end(args); | 362 | va_end(args); |
| @@ -367,7 +367,14 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...) | |||
| 367 | print_oops_end_marker(); | 367 | print_oops_end_marker(); |
| 368 | add_taint(TAINT_WARN); | 368 | add_taint(TAINT_WARN); |
| 369 | } | 369 | } |
| 370 | EXPORT_SYMBOL(warn_slowpath); | 370 | EXPORT_SYMBOL(warn_slowpath_fmt); |
| 371 | |||
| 372 | void warn_slowpath_null(const char *file, int line) | ||
| 373 | { | ||
| 374 | static const char *empty = ""; | ||
| 375 | warn_slowpath_fmt(file, line, empty); | ||
| 376 | } | ||
| 377 | EXPORT_SYMBOL(warn_slowpath_null); | ||
| 371 | #endif | 378 | #endif |
| 372 | 379 | ||
| 373 | #ifdef CONFIG_CC_STACKPROTECTOR | 380 | #ifdef CONFIG_CC_STACKPROTECTOR |
