From: Len Brown <lenb@kernel.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org, Len Brown <len.brown@intel.com>
Subject: [PATCH 03/14] x86 smpboot: Rename match_die() to match_pkg()
Date: Tue, 30 Apr 2019 16:55:48 -0400 [thread overview]
Message-ID: <5704b04c9992ac75ee4f004c21648ae7e9df09c2.1553624867.git.len.brown@intel.com> (raw)
In-Reply-To: <75386dff62ee869eb7357dff1e60dfd9b3e68023.1553624867.git.len.brown@intel.com>
From: Len Brown <len.brown@intel.com>
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>
---
arch/x86/kernel/smpboot.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index ccd1f2a8e557..19a963890bbe 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -459,7 +459,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;
@@ -550,7 +550,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);
/*
@@ -574,7 +574,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;
}
--
2.18.0-rc0
next prev parent reply other threads:[~2019-04-30 20:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 20:55 [PATCH 0/18] v3 multi-die/package topology support Len Brown
2019-04-30 20:55 ` [PATCH 01/14] x86 topology: Fix doc typo Len Brown
2019-04-30 20:55 ` [PATCH 02/14] topolgy: Simplify cputopology.txt formatting and wording Len Brown
2019-04-30 20:55 ` Len Brown [this message]
2019-04-30 20:55 ` [PATCH 04/14] x86 topology: Add CPUID.1F multi-die/package support Len Brown
2019-04-30 20:55 ` [PATCH 05/14] cpu topology: Export die_id Len Brown
2019-04-30 20:55 ` [PATCH 06/14] x86 topology: Define topology_die_id() Len Brown
2019-04-30 20:55 ` [PATCH 07/14] x86 topology: Define topology_logical_die_id() Len Brown
2019-04-30 20:55 ` [PATCH 08/14] powercap/intel_rapl: Simplify rapl_find_package() Len Brown
2019-04-30 20:55 ` [PATCH 09/14] powercap/intel_rapl: Support multi-die/package Len Brown
2019-04-30 20:55 ` [PATCH 10/14] thermal/x86_pkg_temp_thermal: " Len Brown
2019-04-30 20:55 ` [PATCH 11/14] powercap/intel_rapl: update rapl domain name and debug messages Len Brown
2019-04-30 20:55 ` [PATCH 12/14] hwmon/coretemp: Support multi-die/package Len Brown
2019-04-30 20:55 ` [PATCH 13/14] topology: Create package_threads sysfs attribute Len Brown
2019-04-30 20:55 ` [PATCH 14/14] topology: Create core_threads " Len Brown
-- strict thread matches above, loose matches on Subject: below --
2019-02-26 6:19 [PATCH 01/14] x86 topology: Fix doc typo Len Brown
2019-02-26 6:20 ` [PATCH 03/14] x86 smpboot: Rename match_die() to match_pkg() Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5704b04c9992ac75ee4f004c21648ae7e9df09c2.1553624867.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).