Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 327f4387 authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by H. Peter Anvin
Browse files

x86: remove double copy of show_cpuinfo_core for 32 and 64 bit 



Impact: unification

show_cpuinfo_core is identical for 32 and 64 bit and can be unified,
and CONFIG_X86_HT inherently depends on CONFIG_X86_SMP.

Signed-off-by: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 9f361c22

arch/x86/kernel/cpu/proc.c

+2 −18
Original line number Diff line number Diff line
@@ -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,