From patchwork Sat Oct 2 05:35:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zachary Amsden X-Patchwork-Id: 226161 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o925bxIZ017840 for ; Sat, 2 Oct 2010 05:37:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751283Ab0JBFgI (ORCPT ); Sat, 2 Oct 2010 01:36:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5789 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751252Ab0JBFgH (ORCPT ); Sat, 2 Oct 2010 01:36:07 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o925a1WY031219 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 2 Oct 2010 01:36:01 -0400 Received: from [10.11.8.229] (vpn-8-229.rdu.redhat.com [10.11.8.229]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o925ZugU019032; Sat, 2 Oct 2010 01:35:58 -0400 Message-ID: <4CA6C4BB.5020004@redhat.com> Date: Fri, 01 Oct 2010 19:35:55 -1000 From: Zachary Amsden User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100621 Fedora/3.0.5-1.fc13 Thunderbird/3.0.5 MIME-Version: 1.0 To: Michael Tokarev CC: Marcelo Tosatti , Arjan Koers <0h61vkll2ly8@xutrox.com>, kvm@vger.kernel.org, Avi Kivity , Glauber Costa , Andre Przywara , jeremy@xensource.com Subject: Re: 2.6.35-rc1 regression with pvclock and smp guests References: <4CA2F8A3.80400@redhat.com> <4CA30424.9030007@msgid.tls.msk.ru> <4CA30493.6090503@msgid.tls.msk.ru> <4CA392FE.5090009@xutrox.com> <4CA4427C.9090304@msgid.tls.msk.ru> <4CA45F7B.8050806@msgid.tls.msk.ru> <4CA4968F.9050402@redhat.com> <4CA4A8C5.3030407@msgid.tls.msk.ru> <4CA4AD87.8060502@redhat.com> <4CA4DBC8.6070606@xutrox.com> <20100930190507.GA1111@amt.cnet> <4CA51715.1070507@msgid.tls.msk.ru> <4CA51847.5060208@msgid.tls.msk.ru> In-Reply-To: <4CA51847.5060208@msgid.tls.msk.ru> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 02 Oct 2010 05:37:59 +0000 (UTC) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 8b3bfc4..40a383b 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -351,6 +351,8 @@ notrace static void __cpuinit start_secondary(void *unused) unlock_vector_lock(); ipi_call_unlock(); per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE; + x86_cpuinit.setup_percpu_clockev(); + x86_platform.nmi_init(); /* enable local interrupts */ @@ -359,8 +361,6 @@ notrace static void __cpuinit start_secondary(void *unused) /* to prevent fake stack check failure in clock setup */ boot_init_stack_canary(); - x86_cpuinit.setup_percpu_clockev(); - wmb(); cpu_idle(); }