mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Chuansheng Liu <chuansheng.liu@intel.com>
To: mingo@kernel.org, holt@sgi.com, hpa@zytor.com,
	rmk+kernel@arm.linux.org.uk, rja@sgi.com,
	akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, fei.li@intel.com, chuansheng.liu@intel.com
Subject: [PATCH] reboot: re-enable the function of variable reboot_default
Date: Mon, 09 Sep 2013 19:49:40 +0800	[thread overview]
Message-ID: <1378727380.26153.8.camel@cliu38-desktop-build> (raw)


commit b3a5d02ee070c(reboot: move arch/x86 reboot= handling to generic kernel)
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.li@intel.com>
Signed-off-by: liu chuansheng <chuansheng.liu@intel.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




             reply	other threads:[~2013-09-09  2:27 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-09 11:49 Chuansheng Liu [this message]
2013-09-09 15:06 ` Robin Holt
2013-09-09 23:35   ` Liu, Chuansheng
2013-09-10 19:51 ` [tip:x86/reboot] reboot: Re-enable " tip-bot for Chuansheng Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1378727380.26153.8.camel@cliu38-desktop-build \
    --to=chuansheng.liu@intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=fei.li@intel.com \
    --cc=holt@sgi.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=rja@sgi.com \
    --cc=rmk+kernel@arm.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®