Subject: [merged] kernel-rebootc-re-enable-the-function-of-variable-reboot_default.patch removed from -mm tree
To: chuansheng.liu@xxxxxxxxx,fei.li@xxxxxxxxx,robinmholt@xxxxxxxxx,stable@xxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 24 Sep 2013 10:51:42 -0700
The patch titled
Subject: kernel/reboot.c: re-enable the function of variable reboot_default
has been removed from the -mm tree. Its filename was
kernel-rebootc-re-enable-the-function-of-variable-reboot_default.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Chuansheng Liu <chuansheng.liu@xxxxxxxxx>
Subject: kernel/reboot.c: re-enable the function of variable reboot_default
1b3a5d02ee07 ("reboot: move arch/x86 reboot= handling to generic kernel")
did some cleanup for reboot= command line, but it made the reboot_default
inoperative.
The default value of variable reboot_default should be 1, and if command
line reboot= is not set, system will use the default reboot mode.
Signed-off-by: Li Fei <fei.li@xxxxxxxxx>
Signed-off-by: liu chuansheng <chuansheng.liu@xxxxxxxxx>
Acked-by: Robin Holt <robinmholt@xxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> [3.11.x]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/reboot.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff -puN kernel/reboot.c~kernel-rebootc-re-enable-the-function-of-variable-reboot_default kernel/reboot.c
--- a/kernel/reboot.c~kernel-rebootc-re-enable-the-function-of-variable-reboot_default
+++ a/kernel/reboot.c
@@ -32,7 +32,14 @@ EXPORT_SYMBOL(cad_pid);
#endif
enum reboot_mode reboot_mode DEFAULT_REBOOT_MODE;
-int reboot_default;
+/*
+ * This variable is used privately to keep track of whether or not
+ * reboot_type is still set to its default value (i.e., reboot= hasn't
+ * been set on the command line). This is needed so that we can
+ * suppress DMI scanning for reboot quirks. Without it, it's
+ * impossible to override a faulty reboot quirk without recompiling.
+*/
+int reboot_default = 1;
int reboot_cpu;
enum reboot_type reboot_type = BOOT_ACPI;
int reboot_force;
_
Patches currently in -mm which might be from chuansheng.liu@xxxxxxxxx are
linux-next.patch
kernel-rebootc-re-enable-the-function-of-variable-reboot_default-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html