aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-06 23:33:06 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-06 23:33:06 (GMT)
commit948a64995aca6820abefd17f1a4258f5835c5ad9 (patch)
tree4759a88059334793d2799655febbce312ee0f393 /Documentation/x86
parentdb10ad041b318a07985363e243742a07f4b0f44b (diff)
parent8fea0f59e97df3b9b8d2a76af54f633f4586751b (diff)
downloadkernel_replicant_linux-948a64995aca6820abefd17f1a4258f5835c5ad9.zip
kernel_replicant_linux-948a64995aca6820abefd17f1a4258f5835c5ad9.tar.gz
kernel_replicant_linux-948a64995aca6820abefd17f1a4258f5835c5ad9.tar.bz2
Merge branch 'x86-topology-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 topology updates from Ingo Molnar: "Two main changes: preparatory changes for Intel multi-die topology support, plus a syslog message tweak" * 'x86-topology-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/topology: Make DEBUG_HOTPLUG_CPU0 pr_info() more descriptive x86/smpboot: Rename match_die() to match_pkg() topology: Simplify cputopology.txt formatting and wording x86/topology: Fix documentation typo
Diffstat (limited to 'Documentation/x86')
-rw-r--r--Documentation/x86/topology.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/x86/topology.txt b/Documentation/x86/topology.txt
index 2953e3e..06b3cdb 100644
--- a/Documentation/x86/topology.txt
+++ b/Documentation/x86/topology.txt
@@ -51,7 +51,7 @@ The topology of a system is described in the units of:
The physical ID of the package. This information is retrieved via CPUID
and deduced from the APIC IDs of the cores in the package.
- - cpuinfo_x86.logical_id:
+ - cpuinfo_x86.logical_proc_id:
The logical ID of the package. As we do not trust BIOSes to enumerate the
packages in a consistent way, we introduced the concept of logical package