diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-08 10:40:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-08 10:40:34 +0200 |
| commit | edfbeecd92b0c4a648ed96a7e255bfc9a1bc4642 (patch) | |
| tree | efdfc57e2520886842a27f2c9978c83d968ba709 /arch/x86/kernel/topology.c | |
| parent | c808c09b527cd60d9a0d53799935f75e2452174d (diff) | |
| parent | fb1c592cf4c9eeb84ec6bce13c13c11c7d05b6c7 (diff) | |
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/topology.c')
| -rw-r--r-- | arch/x86/kernel/topology.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c index 12cbe2b88c0f..738bf42b0218 100644 --- a/arch/x86/kernel/topology.c +++ b/arch/x86/kernel/topology.c @@ -111,8 +111,10 @@ int arch_register_cpu(int num) /* * Currently CPU0 is only hotpluggable on Intel platforms. Other * vendors can add hotplug support later. + * Xen PV guests don't support CPU0 hotplug at all. */ - if (c->x86_vendor != X86_VENDOR_INTEL) + if (c->x86_vendor != X86_VENDOR_INTEL || + boot_cpu_has(X86_FEATURE_XENPV)) cpu0_hotpluggable = 0; /* |