summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAndreas Ziegler <andreas.ziegler@fau.de>2016-08-04 09:52:09 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-08 20:29:39 +0200
commit574673c231a5fad1560249cc3a598907acb36cf9 (patch)
tree0fee6ecf9ff36c1678ee09f964aada4de5010ad7 /kernel
parentx86/hweight: Don't clobber %rdi (diff)
downloadlinux-574673c231a5fad1560249cc3a598907acb36cf9.tar.xz
linux-574673c231a5fad1560249cc3a598907acb36cf9.zip
printk: Remove unnecessary #ifdef CONFIG_PRINTK
In commit 874f9c7da9a4 ("printk: create pr_<level> functions"), new pr_level defines were added to printk.c. These new defines are guarded by an #ifdef CONFIG_PRINTK - however, there is already a surrounding #ifdef CONFIG_PRINTK starting a lot earlier in line 249 which means the newly introduced #ifdef is unnecessary. Let's remove it to avoid confusion. Signed-off-by: Andreas Ziegler <andreas.ziegler@fau.de> Cc: Joe Perches <joe@perches.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk/printk.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index a5ef95ca18c9..a37fc8cf8e84 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1930,7 +1930,6 @@ asmlinkage int printk_emit(int facility, int level,
}
EXPORT_SYMBOL(printk_emit);
-#ifdef CONFIG_PRINTK
#define define_pr_level(func, loglevel) \
asmlinkage __visible void func(const char *fmt, ...) \
{ \
@@ -1949,7 +1948,6 @@ define_pr_level(__pr_err, LOGLEVEL_ERR);
define_pr_level(__pr_warn, LOGLEVEL_WARNING);
define_pr_level(__pr_notice, LOGLEVEL_NOTICE);
define_pr_level(__pr_info, LOGLEVEL_INFO);
-#endif
int vprintk_default(int level, const char *fmt, va_list args)
{