From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755889AbcHDILf (ORCPT ); Thu, 4 Aug 2016 04:11:35 -0400 Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:57281 "EHLO faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751857AbcHDIL3 (ORCPT ); Thu, 4 Aug 2016 04:11:29 -0400 X-Greylist: delayed 645 seconds by postgrey-1.27 at vger.kernel.org; Thu, 04 Aug 2016 04:11:28 EDT From: Andreas Ziegler To: Andrew Morton Cc: Joe Perches , Borislav Petkov , Linus Torvalds , linux-kernel@vger.kernel.org, Andreas Ziegler Subject: [PATCH] printk: Remove unnecessary #ifdef CONFIG_PRINTK Date: Thu, 4 Aug 2016 09:52:09 +0200 Message-Id: <1470297129-28049-1-git-send-email-andreas.ziegler@fau.de> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In commit 874f9c7da9a4 ("printk: create pr_ 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 --- 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