diff options
author | Ingo Molnar <mingo@kernel.org> | 2024-04-10 07:04:04 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2024-04-10 07:04:04 +0200 |
commit | a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc (patch) | |
tree | d5d5515c98d6163e14d56dfe3272cb3b4e9c7d71 /arch/x86/kernel/cpu/scattered.c | |
parent | 5ce344beaca688f4cdea07045e0b8f03dc537e74 (diff) | |
parent | 2c71fdf02a95b3dd425b42f28fd47fb2b1d22702 (diff) | |
download | linux-stable-a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc.tar.gz linux-stable-a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc.tar.bz2 linux-stable-a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc.zip |
Merge branch 'linus' into x86/urgent, to pick up dependent commits
Prepare to fix aspects of the new BHI code.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/scattered.c')
-rw-r--r-- | arch/x86/kernel/cpu/scattered.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c index a515328d9d7d..af5aa2c754c2 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@ -28,6 +28,7 @@ static const struct cpuid_bit cpuid_bits[] = { { X86_FEATURE_EPB, CPUID_ECX, 3, 0x00000006, 0 }, { X86_FEATURE_INTEL_PPIN, CPUID_EBX, 0, 0x00000007, 1 }, { X86_FEATURE_RRSBA_CTRL, CPUID_EDX, 2, 0x00000007, 2 }, + { X86_FEATURE_BHI_CTRL, CPUID_EDX, 4, 0x00000007, 2 }, { X86_FEATURE_CQM_LLC, CPUID_EDX, 1, 0x0000000f, 0 }, { X86_FEATURE_CQM_OCCUP_LLC, CPUID_EDX, 0, 0x0000000f, 1 }, { X86_FEATURE_CQM_MBM_TOTAL, CPUID_EDX, 1, 0x0000000f, 1 }, |