diff options
| author | Zhenzhong Duan <zhenzhong.duan@oracle.com> | 2011-10-27 22:28:59 -0700 | 
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-11-16 12:13:44 -0500 | 
| commit | 90d4f5534d14815bd94c10e8ceccc57287657ecc (patch) | |
| tree | 7c6c795253a64e61fc8d45ccb28bdd65b4e5e7ab | |
| parent | 72e9cf2ab12ef3e050577ffebdb0c88a28df821d (diff) | |
| download | olio-linux-3.10-90d4f5534d14815bd94c10e8ceccc57287657ecc.tar.xz olio-linux-3.10-90d4f5534d14815bd94c10e8ceccc57287657ecc.zip  | |
xen:pvhvm: enable PVHVM VCPU placement when using more than 32 CPUs.
PVHVM running with more than 32 vcpus and pv_irq/pv_time enabled
need VCPU placement to work, or else it will softlockup.
CC: stable@kernel.org
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
| -rw-r--r-- | arch/x86/xen/enlighten.c | 3 | 
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index da8afd576a6..1f928659c33 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1356,7 +1356,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,  	int cpu = (long)hcpu;  	switch (action) {  	case CPU_UP_PREPARE: -		per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu]; +		xen_vcpu_setup(cpu);  		if (xen_have_vector_callback)  			xen_init_lock_cpu(cpu);  		break; @@ -1386,7 +1386,6 @@ static void __init xen_hvm_guest_init(void)  	xen_hvm_smp_init();  	register_cpu_notifier(&xen_hvm_cpu_notifier);  	xen_unplug_emulated_devices(); -	have_vcpu_info_placement = 0;  	x86_init.irqs.intr_init = xen_init_IRQ;  	xen_hvm_init_time_ops();  	xen_hvm_init_mmu_ops();  |