Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89348fc3 authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

bug: rename __WARN_printf_taint() to __WARN_printf() 

This just renames the helper to improve readability.

Link: http://lkml.kernel.org/r/20190819234111.9019-3-keescook@chromium.org


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Drew Davenport <ddavenport@chromium.org>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Petr Mladek <pmladek@suse.com>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Cc: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ee871133

include/asm-generic/bug.h

+4 −4
Original line number Diff line number Diff line
@@ -96,14 +96,14 @@ void warn_slowpath_fmt(const char *file, const int line, unsigned taint, 
extern void warn_slowpath_null(const char *file, const int line);

#define WANT_WARN_ON_SLOWPATH

#define __WARN()		warn_slowpath_null(__FILE__, __LINE__)

#define __WARN_printf_taint(taint, arg...)				\

#define __WARN_printf(taint, arg...)					\

	warn_slowpath_fmt(__FILE__, __LINE__, taint, arg)

#else

extern __printf(1, 2) void __warn_printk(const char *fmt, ...);

#define __WARN() do { \

	printk(KERN_WARNING CUT_HERE); __WARN_TAINT(TAINT_WARN); \

} while (0)

#define __WARN_printf_taint(taint, arg...)				\

#define __WARN_printf(taint, arg...)					\

	do { __warn_printk(arg); __WARN_TAINT(taint); } while (0)

#endif
@@ -127,7 +127,7 @@ void __warn(const char *file, int line, void *caller, unsigned taint, 
#define WARN(condition, format...) ({					\

	int __ret_warn_on = !!(condition);				\

	if (unlikely(__ret_warn_on))					\

		__WARN_printf_taint(TAINT_WARN, format);		\

		__WARN_printf(TAINT_WARN, format);			\

	unlikely(__ret_warn_on);					\

})

#endif
@@ -135,7 +135,7 @@ void __warn(const char *file, int line, void *caller, unsigned taint, 
#define WARN_TAINT(condition, taint, format...) ({			\

	int __ret_warn_on = !!(condition);				\

	if (unlikely(__ret_warn_on))					\

		__WARN_printf_taint(taint, format);			\

		__WARN_printf(taint, format);				\

	unlikely(__ret_warn_on);					\

})