Commit 350a6042 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents ada1b043 824c6384

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

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ static void get_fixed_ranges(mtrr_type *frs) 


void mtrr_save_fixed_ranges(void *info)

{

	if (boot_cpu_has(X86_FEATURE_MTRR))

	if (mtrr_state.have_fixed)

		get_fixed_ranges(mtrr_state.fixed_ranges);

}