diff options
author | Alex Elder <elder@linaro.org> | 2014-07-09 07:15:17 -0500 |
---|---|---|
committer | Alex Elder <elder@linaro.org> | 2014-07-10 07:16:14 -0500 |
commit | 6ed5ae227e6c676e8123543ef9d1bb72880d3969 (patch) | |
tree | 949e4c86d012f209da33598857019449e0cf71b2 | |
parent | f7d1dfa7731a8ab303e846b64f5e2ff73c5fc180 (diff) |
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>
-rw-r--r-- | kernel/printk/printk.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 646146c2ff9..6f75e8a9969 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -453,11 +453,7 @@ static int log_store(int facility, int level, 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) { @@ -947,11 +943,7 @@ static inline void boot_delay_msec(int level) } #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); static size_t print_time(u64 ts, char *buf) |