From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 5 Feb 2009 12:13:25 +0000 (+0000)
Subject: x86: solve spinlock bug in s3 cpufreq path.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14003^2~32
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=345dd80d935ac1db3caff05b5cf59fc6a859c772;p=xen.git

x86: solve spinlock bug in s3 cpufreq path.

Signed-off-by Kevin Tian <kevin.tian@intel.com>
---

diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index f30a32f0d4..1f96ed6d50 100644
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -1256,8 +1256,6 @@ int __cpu_disable(void)
 	mdelay(1);
 	local_irq_disable();
 
-	cpufreq_del_cpu(cpu);
-
 	time_suspend();
 
 	cpu_mcheck_disable();
@@ -1321,6 +1319,8 @@ int cpu_down(unsigned int cpu)
 
 	printk("Prepare to bring CPU%d down...\n", cpu);
 
+	cpufreq_del_cpu(cpu);
+
 	err = stop_machine_run(take_cpu_down, NULL, cpu);
 	if (err < 0)
 		goto out;