Skip to content

Commit

Permalink
debug warnings: eliminate warn_on_slowpath()
Browse files Browse the repository at this point in the history
Impact: cleanup, eliminate code

now that warn_on_slowpath() uses warn_slowpath(...,NULL), we can
eliminate warn_on_slowpath() altogether and use warn_slowpath().

Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Nov 28, 2008
1 parent bd89bb2 commit ec5679e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
7 changes: 3 additions & 4 deletions include/asm-generic/bug.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions kernel/panic.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,12 +349,6 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...)
add_taint(TAINT_WARN);
}
EXPORT_SYMBOL(warn_slowpath);

void warn_on_slowpath(const char *file, int line)
{
warn_slowpath(file, line, NULL);
}
EXPORT_SYMBOL(warn_on_slowpath);
#endif

#ifdef CONFIG_CC_STACKPROTECTOR
Expand Down

0 comments on commit ec5679e

Please sign in to comment.