Skip to content

Commit 350a604

Browse files
committed
Merge tag 'x86_mtrr_for_v6.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull mtrr update from Borislav Petkov: "A single change to verify the presence of fixed MTRR ranges before accessing the respective MSRs" * tag 'x86_mtrr_for_v6.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mtrr: Check if fixed-range MTRRs exist in mtrr_save_fixed_ranges()
2 parents ada1b04 + 824c638 commit 350a604

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/kernel/cpu/mtrr/generic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ static void get_fixed_ranges(mtrr_type *frs)
593593

594594
void mtrr_save_fixed_ranges(void *info)
595595
{
596-
if (boot_cpu_has(X86_FEATURE_MTRR))
596+
if (mtrr_state.have_fixed)
597597
get_fixed_ranges(mtrr_state.fixed_ranges);
598598
}
599599

0 commit comments

Comments
 (0)