x86: remove double copy of show_cpuinfo_core for 32 and 64 bit
PATCH 1/1 x86: remove double copy of show_cpuinfo_core for 32 and 64 bit
show_cpuinfo_core copy is unnecessary for 32 and 64 bit and CONFIG_X86_HT depends on CONFIG_X86_SMP
Impact: cleanup
Signed-off-by Jaswinder Singh Rajput <[email protected]>
--- arch/x86/kernel/cpu/proc.c | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-)
arch/x86/kernel/cpu/proc.c +2 -18
@@ -7,11 +7,10 @@/* * Get CPU information for use by the procfs. */ -#ifdef CONFIG_X86_32 static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c, unsigned int cpu) { -#ifdef CONFIG_X86_HT +#ifdef CONFIG_SMP if (c->x86_max_cores * smp_num_siblings > 1) { seq_printf(m, "physical id\t: %d\n", c->phys_proc_id); seq_printf(m, "siblings\t: %d\n",
@@ -24,6 +23,7 @@ static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c,#endif } +#ifdef CONFIG_X86_32 static void show_cpuinfo_misc (struct seq_file *m,struct cpuinfo_x86 *c) {/*
@@ -50,22 +50,6 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c) c->wp_works_ok ? "yes" : "no"); }#else -static void show_cpuinfo_core (struct seq_file *m,struct cpuinfo_x86 *c, -unsigned int cpu) -{ -#ifdef CONFIG_SMP -if (c->x86_max_cores * smp_num_siblings >1 ) { -seq_printf (m,"physical id\t: %d\n" , c->phys_proc_id); -seq_printf (m,"siblings\t: %d\n" , -cpus_weight (per_cpu (cpu_core_map, cpu))); -seq_printf (m,"core id\t\t: %d\n" , c->cpu_core_id); -seq_printf (m,"cpu cores\t: %d\n" , c->booted_cores); -seq_printf (m,"apicid\t\t: %d\n" , c->apicid); -seq_printf (m,"initial apicid\t: %d\n" , c->initial_apicid); - } -#endif -} -static void show_cpuinfo_misc (struct seq_file *m,struct cpuinfo_x86 *c) { seq_printf(m,
Signature · 1 line
1.6.0.6