diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfigMany have had misgivings, let me try another pass at this.
index cfc2465e8b77..5f3c50914e92 100644
--- a/arch/arm/configs/aspeed_g4_defconfig
+++ b/arch/arm/configs/aspeed_g4_defconfig
@@ -162,7 +162,7 @@ CONFIG_JFFS2_FS_XATTR=y
CONFIG_UBIFS_FS=y
CONFIG_SQUASHFS=y
CONFIG_SQUASHFS_XZ=y
-CONFIG_PRINTK_TIME=y
+CONFIG_PRINTK_TIME_LOCAL=y
CONFIG_DYNAMIC_DEBUG=y
CONFIG_STRIP_ASM_SYMS=y
CONFIG_DEBUG_FS=y
+if strlen(param) == 1, then param[0] == '0' etc works fine and is KISS.
+static int printk_time_set(const char *val, const struct kernel_param *kp)
+{
+ char *param = strstrip((char *)val);
+ int _printk_time = -1;
+ int stamp;
+
+ if (strlen(param) == 1) {
+ /* Preserve legacy boolean settings */
+ if (!strcmp("0", param) || !strcmp("n", param) ||
+ /*I agree with the restriction in the general case. However (as hinted at before() #ifdef CONFIG_PRINTK_TIME_RESTRICT (default y, or #ifndef CONFIG_PRINTK_TIME_DEBUG default n) around this will allow us users to choose if we are confused or not. I can see being able to change it on the fly as an option. Especially since we have /sys/module/printk/parameters/time.
+ * Only allow enabling and disabling of the current printk_time
+ * setting. Changing it from one setting to another confuses
+ * userspace.
+ */
+ if (printk_time_setting == PRINTK_TIME_DISABLE) {
+ printk_time_setting = _printk_time;
+ } else if ((printk_time_setting != _printk_time) &&
+ (_printk_time != 0)) {
+ pr_warn("printk: timestamp can only be set to 0(disabled) or %s\n",
+ printk_time_str[printk_time_setting]);
+ return -EINVAL;
+ }