From b7af28a7bd89f26782bce46b26e8f559112bebbf Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Sat, 2 Oct 2010 15:07:00 +0100 Subject: [PATCH] xen/x86-64: adjustments to match i386 behavior On i386 the corresponding code is inside X86_HT conditionals, and this config variable is unconditionally off for X86_XEN. Signed-off-by: Jan Beulich --- arch/x86_64/kernel/setup-xen.c | 8 ++++---- include/asm-x86_64/topology.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86_64/kernel/setup-xen.c b/arch/x86_64/kernel/setup-xen.c index 1683ad17..d22d2666 100644 --- a/arch/x86_64/kernel/setup-xen.c +++ b/arch/x86_64/kernel/setup-xen.c @@ -1048,7 +1048,7 @@ static int nearby_node(int apicid) */ static void __init amd_detect_cmp(struct cpuinfo_x86 *c) { -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && !defined(CONFIG_XEN) unsigned bits; #ifdef CONFIG_NUMA int cpu = smp_processor_id(); @@ -1162,7 +1162,7 @@ static void __init init_amd(struct cpuinfo_x86 *c) static void __cpuinit detect_ht(struct cpuinfo_x86 *c) { -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && !defined(CONFIG_XEN) u32 eax, ebx, ecx, edx; int index_msb, core_bits; @@ -1347,7 +1347,7 @@ void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c) c->x86 = 4; } -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && !defined(CONFIG_XEN) c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff; #endif } @@ -1555,7 +1555,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) if (c->x86_cache_size >= 0) seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size); -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && !defined(CONFIG_XEN) if (smp_num_siblings * c->x86_max_cores > 1) { int cpu = c - cpu_data; seq_printf(m, "physical id\t: %d\n", c->phys_proc_id); diff --git a/include/asm-x86_64/topology.h b/include/asm-x86_64/topology.h index 6e7a2e97..f190294d 100644 --- a/include/asm-x86_64/topology.h +++ b/include/asm-x86_64/topology.h @@ -54,7 +54,7 @@ extern int __node_distance(int, int); #endif -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && !defined(CONFIG_XEN) #define topology_physical_package_id(cpu) (cpu_data[cpu].phys_proc_id) #define topology_core_id(cpu) (cpu_data[cpu].cpu_core_id) #define topology_core_siblings(cpu) (cpu_core_map[cpu]) -- 2.39.5