Browse Source

printk: use a clever macro

Use the IS_ENABLED() macro rather than #ifdef blocks to set certain
global values.

Signed-off-by: Alex Elder <elder@linaro.org>
Acked-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jan Kara <jack@suse.cz>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Alex Elder 11 years ago
parent
commit
e99aa46166
1 changed files with 2 additions and 10 deletions
  1. 2 10
      kernel/printk/printk.c

+ 2 - 10
kernel/printk/printk.c

@@ -454,11 +454,7 @@ static int log_store(int facility, int level,
 	return msg->text_len;
 	return msg->text_len;
 }
 }
 
 
-#ifdef CONFIG_SECURITY_DMESG_RESTRICT
-int dmesg_restrict = 1;
-#else
-int dmesg_restrict;
-#endif
+int dmesg_restrict = IS_ENABLED(CONFIG_SECURITY_DMESG_RESTRICT);
 
 
 static int syslog_action_restricted(int type)
 static int syslog_action_restricted(int type)
 {
 {
@@ -988,11 +984,7 @@ static inline void boot_delay_msec(int level)
 }
 }
 #endif
 #endif
 
 
-#if defined(CONFIG_PRINTK_TIME)
-static bool printk_time = 1;
-#else
-static bool printk_time;
-#endif
+static bool printk_time = IS_ENABLED(CONFIG_PRINTK_TIME);
 module_param_named(time, printk_time, bool, S_IRUGO | S_IWUSR);
 module_param_named(time, printk_time, bool, S_IRUGO | S_IWUSR);
 
 
 static size_t print_time(u64 ts, char *buf)
 static size_t print_time(u64 ts, char *buf)