diff options
| author | Alex Elder <elder@linaro.org> | 2014-08-06 16:09:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-06 18:01:24 -0700 |
| commit | e99aa461660a6413b11da887fb499e04a0f46803 (patch) | |
| tree | 178dc2d1eddad3d97e4cf5cb15c2c723458b0b5f /kernel | |
| parent | 0b90fec3b990b50d77944bc73c1ba4b031dfa52f (diff) | |
| download | op-kernel-dev-e99aa461660a6413b11da887fb499e04a0f46803.zip op-kernel-dev-e99aa461660a6413b11da887fb499e04a0f46803.tar.gz | |
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>
Diffstat (limited to 'kernel')
| -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 4bae344..ac86838 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -454,11 +454,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) { @@ -988,11 +984,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) |
