diff options
author | Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:52:51 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:52:51 +0100 |
commit | 9cea0d46f52f31c077a83a9b9e4e3887adfbecbe (patch) | |
tree | 3910cec9563476f23108de6618ad55cf0c87e62a /arch/x86/include/asm/processor.h | |
parent | 8c490b42fe91c10d5756efe56014240c669e7720 (diff) | |
parent | 08f253ec3767bcfafc5d32617a92cee57c63968e (diff) | |
download | lwn-9cea0d46f52f31c077a83a9b9e4e3887adfbecbe.tar.gz lwn-9cea0d46f52f31c077a83a9b9e4e3887adfbecbe.zip |
Merge branch 'x86/cpu' into x86/core, to resolve conflicts
Conflicts:
arch/x86/include/asm/cpufeatures.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/processor.h')
-rw-r--r-- | arch/x86/include/asm/processor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index dd34100455d2..91d0f93a00c7 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -119,6 +119,8 @@ struct cpuinfo_x86 { int x86_cache_mbm_width_offset; int x86_power; unsigned long loops_per_jiffy; + /* protected processor identification number */ + u64 ppin; /* cpuid returned max cores value: */ u16 x86_max_cores; u16 apicid; |