diff options
| author | Anton Arapov <anton@redhat.com> | 2012-05-09 08:48:00 +0200 |
|---|---|---|
| committer | Anton Arapov <anton@redhat.com> | 2012-05-09 08:48:00 +0200 |
| commit | c0e33d8195b424eb29432998c565d09398933d32 (patch) | |
| tree | 0bca45b5a68691709a11fea3ad78fd6a6cb98c02 /arch/x86/xen | |
| parent | b4b6116a13633898cf868f2f103c96a90c4c20f8 (diff) | |
| download | kernel-uprobes-c0e33d8195b424eb29432998c565d09398933d32.tar.gz kernel-uprobes-c0e33d8195b424eb29432998c565d09398933d32.tar.xz kernel-uprobes-c0e33d8195b424eb29432998c565d09398933d32.zip | |
fedora kernel: 5963c7872d2bee76ac20ba1ccd2ffbbfe9eb5f8bv3.3.5-2
Signed-off-by: Anton Arapov <anton@redhat.com>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/smp.c | 15 | ||||
| -rw-r--r-- | arch/x86/xen/xen-asm.S | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 501d4e0244b..f2ce60a3c45 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -172,6 +172,7 @@ static void __init xen_fill_possible_map(void) static void __init xen_filter_cpu_maps(void) { int i, rc; + unsigned int subtract = 0; if (!xen_initial_domain()) return; @@ -186,8 +187,22 @@ static void __init xen_filter_cpu_maps(void) } else { set_cpu_possible(i, false); set_cpu_present(i, false); + subtract++; } } +#ifdef CONFIG_HOTPLUG_CPU + /* This is akin to using 'nr_cpus' on the Linux command line. + * Which is OK as when we use 'dom0_max_vcpus=X' we can only + * have up to X, while nr_cpu_ids is greater than X. This + * normally is not a problem, except when CPU hotplugging + * is involved and then there might be more than X CPUs + * in the guest - which will not work as there is no + * hypercall to expand the max number of VCPUs an already + * running guest has. So cap it up to X. */ + if (subtract) + nr_cpu_ids = nr_cpu_ids - subtract; +#endif + } static void __init xen_smp_prepare_boot_cpu(void) diff --git a/arch/x86/xen/xen-asm.S b/arch/x86/xen/xen-asm.S index 79d7362ad6d..3e45aa00071 100644 --- a/arch/x86/xen/xen-asm.S +++ b/arch/x86/xen/xen-asm.S @@ -96,7 +96,7 @@ ENTRY(xen_restore_fl_direct) /* check for unmasked and pending */ cmpw $0x0001, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_pending - jz 1f + jnz 1f 2: call check_events 1: ENDPATCH(xen_restore_fl_direct) |