LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Eduardo Habkost <ehabkost@redhat.com>
To: Avi Kivity <avi@redhat.com>, Ingo Molnar <mingo@elte.hu>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>,
	Simon Horman <horms@verge.net.au>, Andrew Morton <akpm@osdl.org>,
	Vivek Goyal <vgoyal@redhat.com>, Haren Myneni <hbabu@us.ibm.com>,
	Andrey Borzenkov <arvidjaar@mail.ru>,
	mingo@redhat.com, "Rafael J. Wysocki" <rjw@sisk.pl>,
	kexec@lists.infradead.org, kvm@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Eduardo Habkost <ehabkost@redhat.com>
Subject: [PATCH 07/16] x86: Make nmi_shootdown_cpus() available on !SMP and !X86_LOCAL_APIC
Date: Tue,  4 Nov 2008 12:52:35 -0200	[thread overview]
Message-ID: <1225810364-8990-8-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1225810364-8990-1-git-send-email-ehabkost@redhat.com>

The X86_LOCAL_APIC #ifdef was for kdump. For !SMP, the function simply
does nothing.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 arch/x86/kernel/reboot.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index b65fc86..80d5e9c 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -522,7 +522,7 @@ void machine_crash_shutdown(struct pt_regs *regs)
 #endif
 
 
-#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
+#if defined(CONFIG_SMP)
 
 /* This keeps a track of which one is crashing cpu. */
 static int crashing_cpu;
@@ -568,6 +568,12 @@ static struct notifier_block crash_nmi_nb = {
 	.notifier_call = crash_nmi_callback,
 };
 
+/* Halt all other CPUs, calling the specified function on each of them
+ *
+ * This function can be used to halt all other CPUs on crash
+ * or emergency reboot time. The function passed as parameter
+ * will be called inside a NMI handler on all CPUs.
+ */
 void nmi_shootdown_cpus(nmi_shootdown_cb callback)
 {
 	unsigned long msecs;
@@ -596,4 +602,9 @@ void nmi_shootdown_cpus(nmi_shootdown_cb callback)
 
 	/* Leave the nmi callback set */
 }
+#else /* !CONFIG_SMP */
+void nmi_shootdown_cpus(nmi_shootdown_cb callback)
+{
+	/* No other CPUs to shoot down */
+}
 #endif
-- 
1.5.5.GIT


  parent reply	other threads:[~2008-11-04 14:58 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-04 14:52 [PATCH 00/14] x86: disable virt on kdump and emergency_restart Eduardo Habkost
2008-11-04 14:52 ` [PATCH 01/16] x86 kdump: Extract kdump-specific code from crash_nmi_callback() Eduardo Habkost
2008-11-04 14:52 ` [PATCH 02/16] x86 kdump: Move crashing_cpu assignment to nmi_shootdown_cpus() Eduardo Habkost
2008-11-04 14:52 ` [PATCH 03/16] x86 kdump: Create kdump_nmi_shootdown_cpus() Eduardo Habkost
2008-11-04 14:52 ` [PATCH 04/16] x86 kdump: Make kdump_nmi_callback() a function ptr on crash_nmi_callback() Eduardo Habkost
2008-11-04 14:52 ` [PATCH 05/16] x86 kdump: Make nmi_shootdown_cpus() non-static Eduardo Habkost
2008-11-04 14:52 ` [PATCH 06/16] x86: Move nmi_shootdown_cpus() to reboot.c Eduardo Habkost
2008-11-04 14:52 ` Eduardo Habkost [this message]
2008-11-04 18:15   ` [PATCH 07/16] x86: Make nmi_shootdown_cpus() available on !SMP and !X86_LOCAL_APIC Eduardo Habkost
2008-11-04 14:52 ` [PATCH 08/16] x86: Emergency virtualization disable function Eduardo Habkost
2008-11-05 17:33   ` Eric W. Biederman
2008-11-05 17:52     ` Eduardo Habkost
2008-11-06  9:48       ` Avi Kivity
2008-11-06 10:22         ` Eric W. Biederman
2008-11-06 10:30           ` Avi Kivity
2008-11-06 17:45             ` Eduardo Habkost
2008-11-09 11:23               ` Avi Kivity
2008-11-04 14:52 ` [PATCH 09/16] kdump: Hook emergency_virt_disable() on crash shutdown code Eduardo Habkost
2008-11-05 14:41   ` Vivek Goyal
2008-11-05 15:07     ` Eduardo Habkost
2008-11-04 14:52 ` [PATCH 10/16] x86: disable virtualization on all CPUs if needed, on emergency_restart Eduardo Habkost
2008-11-04 14:52 ` [PATCH 11/16] kvm_x86_ops: crash_hardware_disable() operation Eduardo Habkost
2008-11-04 14:52 ` [PATCH 12/16] kvm: svm: set crash_hardware_disable to svm_hardware_disable Eduardo Habkost
2008-11-04 14:52 ` [PATCH 13/16] kvm: vmx: crash_hardware_disable function Eduardo Habkost
2008-11-04 14:52 ` [PATCH 14/16] kvmx: x86: set kvm_x86_ops earlier on kvm_arch_init() Eduardo Habkost
2008-11-04 14:52 ` [PATCH 15/16] kvm: x86: set kdump virt_disable function on initialization Eduardo Habkost
2008-11-05 17:26   ` Eric W. Biederman
2008-11-05 17:50     ` Eduardo Habkost
2008-11-06  9:44     ` Avi Kivity
2008-11-04 14:52 ` [PATCH 16/16] Revert "x86: default to reboot via ACPI" Eduardo Habkost
2008-11-04 16:54 ` [PATCH 00/14] x86: disable virt on kdump and emergency_restart Avi Kivity
2008-11-05 14:44   ` Vivek Goyal
2008-11-05 15:04     ` Eduardo Habkost
2008-11-06  9:52     ` Avi Kivity
2008-11-05 16:33   ` Ingo Molnar
2008-11-06  9:49     ` Avi Kivity
2008-11-06 12:28       ` Eduardo Habkost

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=1225810364-8990-8-git-send-email-ehabkost@redhat.com \
    --to=ehabkost@redhat.com \
    --cc=akpm@osdl.org \
    --cc=arvidjaar@mail.ru \
    --cc=avi@redhat.com \
    --cc=ebiederm@xmission.com \
    --cc=hbabu@us.ibm.com \
    --cc=horms@verge.net.au \
    --cc=kexec@lists.infradead.org \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@redhat.com \
    --cc=rjw@sisk.pl \
    --cc=vgoyal@redhat.com \
    /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;
as well as URLs for NNTP newsgroup(s).