From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 12 Mar 2009 11:16:54 +0000 (+0000)
Subject: x86: Fix APIC 0x40 error when CPU online and Host s3 resume
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13992^2~91
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0ca8557b7116b54dd879d08eb25e45a277445694;p=xen.git

x86: Fix APIC 0x40 error when CPU online and Host s3 resume

disable_APIC_timer actually is not useful here. Actually it will
trigger a local APIC error when masking the LVT entry when vector is
zero (before timer is inited) on Intel P6 family. This APIC error(40)
appears when online the offlined CPU and Host S3 resume.

Signed-off-by: Liping Ke <liping.ke@intel.com>
Signed-off-by: Gang Wei <gang.wei@intel.com>
---

diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index 1f96ed6d50..2842fa6a57 100644
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -385,9 +385,7 @@ void __devinit smp_callin(void)
 	/*
 	 * Save our processor parameters
 	 */
- 	smp_store_cpu_info(cpuid);
-
-	disable_APIC_timer();
+	smp_store_cpu_info(cpuid);
 
 	/*
 	 * Allow the master to continue.