| From 0e6a66add69ebee7121876d79ee243a4a2093886 Mon Sep 17 00:00:00 2001 |
| From: Kees Cook <keescook@chromium.org> |
| Date: Wed, 25 Sep 2019 16:47:55 -0700 |
| Subject: [PATCH] bug: rename __WARN_printf_taint() to __WARN_printf() |
| |
| commit 89348fc31441f0270b040fbeb68b6d7d13504f36 upstream. |
| |
| This just renames the helper to improve readability. |
| |
| Link: http://lkml.kernel.org/r/20190819234111.9019-3-keescook@chromium.org |
| Signed-off-by: Kees 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: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h |
| index c3a9c16a2b69..2d35bbf687d0 100644 |
| --- a/include/asm-generic/bug.h |
| +++ b/include/asm-generic/bug.h |
| @@ -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); \ |
| }) |
| |
| -- |
| 2.7.4 |
| |