diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-08-26 14:28:50 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-09-09 12:06:45 -0400 |
commit | fb78e58c275599a961557bca201dd897565833ca (patch) | |
tree | 35c350aae49d3dfec694cd2c28f565b95bcfad77 /arch | |
parent | 3310bbedac497b793b96184e1b9b5da4f747d53a (diff) |
Revert "xen/spinlock: Disable IRQ spinlock (PV) allocation on PVHVM"
This reverts commit 70dd4998cb85f0ecd6ac892cc7232abefa432efb.
Now that the bugs have been resolved we can re-enable the
PV ticketlock implementation under PVHVM Xen guests.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/xen/spinlock.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c index e1bff87766be..b3c1ee8f0993 100644 --- a/arch/x86/xen/spinlock.c +++ b/arch/x86/xen/spinlock.c | |||
@@ -230,13 +230,6 @@ void xen_init_lock_cpu(int cpu) | |||
230 | WARN(per_cpu(lock_kicker_irq, cpu) >= 0, "spinlock on CPU%d exists on IRQ%d!\n", | 230 | WARN(per_cpu(lock_kicker_irq, cpu) >= 0, "spinlock on CPU%d exists on IRQ%d!\n", |
231 | cpu, per_cpu(lock_kicker_irq, cpu)); | 231 | cpu, per_cpu(lock_kicker_irq, cpu)); |
232 | 232 | ||
233 | /* | ||
234 | * See git commit f10cd522c5fbfec9ae3cc01967868c9c2401ed23 | ||
235 | * (xen: disable PV spinlocks on HVM) | ||
236 | */ | ||
237 | if (xen_hvm_domain()) | ||
238 | return; | ||
239 | |||
240 | name = kasprintf(GFP_KERNEL, "spinlock%d", cpu); | 233 | name = kasprintf(GFP_KERNEL, "spinlock%d", cpu); |
241 | irq = bind_ipi_to_irqhandler(XEN_SPIN_UNLOCK_VECTOR, | 234 | irq = bind_ipi_to_irqhandler(XEN_SPIN_UNLOCK_VECTOR, |
242 | cpu, | 235 | cpu, |
@@ -256,13 +249,6 @@ void xen_init_lock_cpu(int cpu) | |||
256 | 249 | ||
257 | void xen_uninit_lock_cpu(int cpu) | 250 | void xen_uninit_lock_cpu(int cpu) |
258 | { | 251 | { |
259 | /* | ||
260 | * See git commit f10cd522c5fbfec9ae3cc01967868c9c2401ed23 | ||
261 | * (xen: disable PV spinlocks on HVM) | ||
262 | */ | ||
263 | if (xen_hvm_domain()) | ||
264 | return; | ||
265 | |||
266 | if (!xen_pvspin) | 252 | if (!xen_pvspin) |
267 | return; | 253 | return; |
268 | 254 | ||
@@ -275,12 +261,6 @@ void xen_uninit_lock_cpu(int cpu) | |||
275 | 261 | ||
276 | void __init xen_init_spinlocks(void) | 262 | void __init xen_init_spinlocks(void) |
277 | { | 263 | { |
278 | /* | ||
279 | * See git commit f10cd522c5fbfec9ae3cc01967868c9c2401ed23 | ||
280 | * (xen: disable PV spinlocks on HVM) | ||
281 | */ | ||
282 | if (xen_hvm_domain()) | ||
283 | return; | ||
284 | 264 | ||
285 | if (!xen_pvspin) { | 265 | if (!xen_pvspin) { |
286 | printk(KERN_DEBUG "xen: PV spinlocks disabled\n"); | 266 | printk(KERN_DEBUG "xen: PV spinlocks disabled\n"); |