[PATCH] printk: Remove unnecessary #ifdef CONFIG_PRINTK

Path	csiph.com!weretis.net!feeder4.news.weretis.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	Andreas Ziegler <andreas.ziegler@fau.de>
Newsgroups	linux.kernel
Subject	[PATCH] printk: Remove unnecessary #ifdef CONFIG_PRINTK
Date	Thu, 04 Aug 2016 10:20:01 +0200
Message-ID	<s2m2J-6ld-7@gated-at.bofh.it> (permalink)
X-Original-To	Andrew Morton <akpm@linux-foundation.org>
X-Greylist	delayed 645 seconds by postgrey-1.27 at vger.kernel.org; Thu, 04 Aug 2016 04:11:28 EDT
X-Mailer	git-send-email 1.9.1
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	35
Organization	linux.* mail to news gateway
X-Original-Cc	Joe Perches <joe@perches.com>, Borislav Petkov <bp@suse.de>, Linus Torvalds <torvalds@linux-foundation.org>, linux-kernel@vger.kernel.org, Andreas Ziegler <andreas.ziegler@fau.de>
X-Original-Date	Thu, 4 Aug 2016 09:52:09 +0200
X-Original-Message-ID	<1470297129-28049-1-git-send-email-andreas.ziegler@fau.de>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1456209

Show key headers only | View raw

In commit 874f9c7da9a4 ("printk: create pr_<level> functions") in
linux-next, new pr_level defines were added to printk.c. These
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>
---
 kernel/printk/printk.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index a5ef95c..a37fc8c 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)
 {
-- 
1.9.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] printk: Remove unnecessary #ifdef CONFIG_PRINTK Andreas Ziegler <andreas.ziegler@fau.de> - 2016-08-04 10:20 +0200

csiph-web