[obsolete] printk-remove-unnecessary-ifdef-config_printk.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: printk: remove unnecessary #ifdef CONFIG_PRINTK
has been removed from the -mm tree.  Its filename was
     printk-remove-unnecessary-ifdef-config_printk.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andreas Ziegler <andreas.ziegler@xxxxxx>
Subject: printk: remove unnecessary #ifdef CONFIG_PRINTK

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.

Link: http://lkml.kernel.org/r/1470297129-28049-1-git-send-email-andreas.ziegler@xxxxxx
Signed-off-by: Andreas Ziegler <andreas.ziegler@xxxxxx>
Cc: Joe Perches <joe@xxxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 kernel/printk/printk.c |    2 --
 1 file changed, 2 deletions(-)

diff -puN kernel/printk/printk.c~printk-remove-unnecessary-ifdef-config_printk kernel/printk/printk.c
--- a/kernel/printk/printk.c~printk-remove-unnecessary-ifdef-config_printk
+++ a/kernel/printk/printk.c
@@ -1930,7 +1930,6 @@ asmlinkage int printk_emit(int facility,
 }
 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)
 {
_

Patches currently in -mm which might be from andreas.ziegler@xxxxxx are


--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]
  Powered by Linux