Skip to content

Commit

Permalink
kernel/reboot.c: re-enable the function of variable reboot_default
Browse files Browse the repository at this point in the history
Commit 1b3a5d0 ("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.

[[email protected]: fix comment layout]
Signed-off-by: Li Fei <[email protected]>
Signed-off-by: liu chuansheng <[email protected]>
Acked-by: Robin Holt <[email protected]>
Cc: <[email protected]>	[3.11.x]
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Chuansheng-Liu authored and torvalds committed Sep 25, 2013
1 parent 8ac1c8d commit e2f0b88
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion kernel/reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e2f0b88

Please sign in to comment.