|
@@ -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)
|