On Mon, Sep 09, 2013 at 07:49:40PM +0800, Chuansheng Liu wrote: > > commit b3a5d02ee070c(reboot: move arch/x86 reboot= handling to generic kernel)
The commit id was really 1b3a5d02ee070c > did some cleanup for reboot= command line, but it made the reboot_default > to be invalidated. > > 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...@intel.com> > Signed-off-by: liu chuansheng <chuansheng....@intel.com> Acked-by: Robin Holt <robinmh...@linux.com> Thank you for fixing my bug. Note: My email address used to be h...@sgi.com > --- > kernel/reboot.c | 9 ++++++++- > 1 files changed, 8 insertions(+), 1 deletions(-) > > diff --git a/kernel/reboot.c b/kernel/reboot.c > index 269ed93..d82eb6e 100644 > --- a/kernel/reboot.c > +++ b/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; > -- > 1.7.0.4 > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
