From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arun Sharma <arun.sharma@intel.com>
Subject: [PATCH] fix-multiple-vmxon.patch
Date: Wed, 20 Apr 2005 17:01:06 -0700
Message-ID: <20050421000105.GA18166@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Ian Pratt <Ian.Pratt@cl.cam.ac.uk>, Keir Fraser <Keir.Fraser@cl.cam.ac.uk>
Cc: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

__vmxon() is called twice for the boot cpu, because identify_cpu() is called
twice. This patch ensures that identify_cpu() and hence __vmxon() is called
exactly once for the boot CPU on SMP.

Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>

diff -puN arch/x86/smpboot.c~fix-multiple-vmxon arch/x86/smpboot.c
--- xen/arch/x86/smpboot.c~fix-multiple-vmxon	2005-04-11 08:52:26.293486000 -0700
+++ xen-askeshav/arch/x86/smpboot.c	2005-04-11 08:58:58.513486000 -0700
@@ -114,7 +114,8 @@ void __init smp_alloc_memory(void)
 void __init smp_store_cpu_info(int id)
 {
     cpu_data[id] = boot_cpu_data;
-    identify_cpu(&cpu_data[id]);
+    if (id != 0)
+        identify_cpu(&cpu_data[id]);
 }
 
 /*
_