LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Avi Kivity <avi@qumranet.com>
Cc: Jeff Garzik <jeff@garzik.org>, Adrian Bunk <bunk@kernel.org>,
	LKML <linux-kernel@vger.kernel.org>,
	akpm@linux-foundation.org,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [patch] kvm: fix !SMP build error
Date: Wed, 24 Oct 2007 20:11:07 +0200	[thread overview]
Message-ID: <20071024181107.GA15250@elte.hu> (raw)
In-Reply-To: <20071024123650.GA31562@elte.hu>


* Ingo Molnar <mingo@elte.hu> wrote:

> * Ingo Molnar <mingo@elte.hu> wrote:
> 
> > i have triggered this and fixed it the right way - see the patch 
> > below. This fixes the 2.6.24-rc1 build error.
> 
> and this followup patch is needed too if my patch is applied.

plus the patch below is needed too in addition.

	Ingo

------------->
Subject: x86: fix build error in arch/x86/kernel/nmi_32.c
From: Ingo Molnar <mingo@elte.hu>

nmi_cpu_busy() must be available on !SMP too.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/kernel/nmi_32.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux/arch/x86/kernel/nmi_32.c
===================================================================
--- linux.orig/arch/x86/kernel/nmi_32.c
+++ linux/arch/x86/kernel/nmi_32.c
@@ -53,13 +53,13 @@ static int unknown_nmi_panic_callback(st
 
 static int endflag __initdata = 0;
 
-#ifdef CONFIG_SMP
 /* The performance counters used by NMI_LOCAL_APIC don't trigger when
  * the CPU is idle. To make sure the NMI watchdog really ticks on all
  * CPUs during the test make them busy.
  */
 static __init void nmi_cpu_busy(void *data)
 {
+#ifdef CONFIG_SMP
 	local_irq_enable_in_hardirq();
 	/* Intentionally don't use cpu_relax here. This is
 	   to make sure that the performance counter really ticks,
@@ -69,8 +69,8 @@ static __init void nmi_cpu_busy(void *da
 	   care if they get somewhat less cycles. */
 	while (endflag == 0)
 		mb();
-}
 #endif
+}
 
 static int __init check_nmi_watchdog(void)
 {

  reply	other threads:[~2007-10-24 18:11 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-23 22:36 [PATCH 1/12] X86: fix !CONFIG_SMP warning in processor.c Jeff Garzik
2007-10-23 22:36 ` [PATCH 2/12] X86: fix nvidia HPET warning Jeff Garzik
2007-10-24  4:05   ` Jeremy Fitzhardinge
2007-10-24  6:05     ` Jeff Garzik
2007-10-24 12:03   ` Ingo Molnar
2007-10-23 22:36 ` [PATCH 3/12] ACPI sbs: fix retval warning Jeff Garzik
2007-10-30 10:31   ` Jeff Garzik
2007-10-23 22:36 ` [PATCH 4/12] riscom8: fix SMP brokenness Jeff Garzik
2007-10-24  6:47   ` Jiri Slaby
2007-10-24  6:52     ` Jeff Garzik
2007-10-24  7:44       ` Jiri Slaby
2007-10-24  7:10     ` Andrew Morton
2007-10-24  7:44       ` Jiri Slaby
2007-10-24  8:00         ` Andrew Morton
2008-02-07  0:29   ` [bug] " Ingo Molnar
2008-02-20 20:37     ` Jeff Garzik
2008-02-20 22:00       ` Alan Cox
2007-10-23 22:36 ` [PATCH 5/12] ISDN/sc: fix longstanding warning Jeff Garzik
2007-10-24  7:24   ` Karsten Keil
2007-10-23 22:36 ` [PATCH 6/12] KVM: work around SMP requirement Jeff Garzik
2007-10-23 22:44   ` Adrian Bunk
2007-10-23 22:46     ` Jeff Garzik
2007-10-24  8:36       ` Avi Kivity
2007-10-24 12:32         ` [patch] kvm: fix !SMP build error Ingo Molnar
2007-10-24 12:36           ` Ingo Molnar
2007-10-24 18:11             ` Ingo Molnar [this message]
2007-11-01  3:34               ` Randy Dunlap
2007-11-01  8:31                 ` Ingo Molnar
2007-11-01 13:10                   ` Avi Kivity
2007-11-01 14:59                     ` Ingo Molnar
2007-11-01 21:16                       ` Avi Kivity
2007-10-23 22:36 ` [PATCH 7/12] eexpress: fix !SMP unused-var warning Jeff Garzik
2007-10-23 22:36 ` [PATCH 8/12] ni5010: kill unused variable Jeff Garzik
2007-10-23 22:36 ` [PATCH 9/12] cgroup: " Jeff Garzik
2007-10-24  0:19   ` Paul Menage
2007-10-23 22:36 ` [PATCH 10/12] mac80211: fix warning created by BIT() Jeff Garzik
2007-10-23 23:15   ` Randy Dunlap
2007-10-23 22:36 ` [PATCH 11/12] NET: fix subqueue bugs Jeff Garzik
2007-10-23 22:38   ` David Miller
2007-10-23 22:40     ` Jeff Garzik
2007-10-23 22:36 ` [PATCH 12/12] sound/isa: fix printk format Jeff Garzik
2007-10-24  4:03 ` [PATCH 1/12] X86: fix !CONFIG_SMP warning in processor.c Jeremy Fitzhardinge
2007-10-24 12:01 ` Ingo Molnar
2007-10-24 16:27 ` [2.6 patch] x86/kernel/acpi/processor.c: fix SMP=n warning Adrian Bunk

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=20071024181107.GA15250@elte.hu \
    --to=mingo@elte.hu \
    --cc=akpm@linux-foundation.org \
    --cc=avi@qumranet.com \
    --cc=bunk@kernel.org \
    --cc=jeff@garzik.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --subject='Re: [patch] kvm: fix '\!'SMP build error' \
    /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

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).