x86/smpboot: Rename match_die() to match_pkg() (169d0869) · Commits · 戴 / test

Syntax only, no functional or semantic change. This routine matches packages, not die, so name it thus. Signed-off-by:

Len Brown <len.brown@intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Will Deacon <will.deacon@arm.com> Link: http://lkml.kernel.org/r/7ca18c4ae7816a1f9eda37414725df676e63589d.1551160674.git.len.brown@intel.com Signed-off-by:

arch/x86/kernel/smpboot.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -455,7 +455,7 @@ static bool match_llc(struct cpuinfo_x86 c, struct cpuinfo_x86 o)
		* multicore group inside a NUMA node. If this happens, we will
		* discard the MC level of the topology later.
		*/
		static bool match_die(struct cpuinfo_x86 c, struct cpuinfo_x86 o)
		static bool match_pkg(struct cpuinfo_x86 c, struct cpuinfo_x86 o)
		{
		if (c->phys_proc_id == o->phys_proc_id)
		return true;
		@@ -546,7 +546,7 @@ void set_cpu_sibling_map(int cpu)
		for_each_cpu(i, cpu_sibling_setup_mask) {
		o = &cpu_data(i);

		if ((i == cpu) \|\| (has_mp && match_die(c, o))) {
		if ((i == cpu) \|\| (has_mp && match_pkg(c, o))) {
		link_mask(topology_core_cpumask, cpu, i);

		/*
		@@ -570,7 +570,7 @@ void set_cpu_sibling_map(int cpu)
		} else if (i != cpu && !c->booted_cores)
		c->booted_cores = cpu_data(i).booted_cores;
		}
		if (match_die(c, o) && !topology_same_node(c, o))
		if (match_pkg(c, o) && !topology_same_node(c, o))
		x86_has_numa_in_package = true;
		}