Commit e2f0b88e authored Sep 24, 2013 by Chuansheng Liu Committed by Linus Torvalds Sep 24, 2013

kernel/reboot.c: re-enable the function of variable reboot_default



Commit 1b3a5d02 ("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.

[akpm@linux-foundation.org: fix comment layout]
Signed-off-by: Li Fei <fei.li@intel.com>
Signed-off-by: liu chuansheng <chuansheng.liu@intel.com>
Acked-by: Robin Holt <robinmholt@linux.com>
Cc: <stable@vger.kernel.org>	[3.11.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8ac1c8d5

kernel/reboot.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message