Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761003AbXJXSLo (ORCPT ); Wed, 24 Oct 2007 14:11:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756172AbXJXSLa (ORCPT ); Wed, 24 Oct 2007 14:11:30 -0400 Received: from mx2.mail.elte.hu ([157.181.151.9]:39294 "EHLO mx2.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756500AbXJXSL3 (ORCPT ); Wed, 24 Oct 2007 14:11:29 -0400 Date: Wed, 24 Oct 2007 20:11:07 +0200 From: Ingo Molnar To: Avi Kivity Cc: Jeff Garzik , Adrian Bunk , LKML , akpm@linux-foundation.org, Linus Torvalds Subject: Re: [patch] kvm: fix !SMP build error Message-ID: <20071024181107.GA15250@elte.hu> References: <20071023223640.EADF31F81AC@havoc.gtf.org> <20071023224455.GY30533@stusta.de> <471E79E2.2090204@garzik.org> <471F03F5.7090608@qumranet.com> <20071024123258.GA28653@elte.hu> <20071024123650.GA31562@elte.hu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20071024123650.GA31562@elte.hu> User-Agent: Mutt/1.5.14 (2007-02-12) X-ELTE-VirusStatus: clean X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.1.7-deb -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1763 Lines: 59 * Ingo Molnar wrote: > * Ingo Molnar 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 nmi_cpu_busy() must be available on !SMP too. Signed-off-by: Ingo Molnar --- 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) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/