Selaa lähdekoodia

i386: mtrr crash fix

Commit 3ebad5905609476a4ff1151a66b21d9794009961 ("[PATCH] x86: Save and
restore the fixed-range MTRRs of the BSP when suspending") added mtrr
operations without verifying that the CPU has MTRRs.  Crashes transmeta
CPUs.

Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <linux@horizon.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Andrew Morton 18 vuotta sitten
vanhempi
commit
84288ad89e
1 muutettua tiedostoa jossa 2 lisäystä ja 1 poistoa
  1. 2 1
      arch/i386/kernel/cpu/mtrr/generic.c

+ 2 - 1
arch/i386/kernel/cpu/mtrr/generic.c

@@ -65,7 +65,8 @@ get_fixed_ranges(mtrr_type * frs)
 
 
 void mtrr_save_fixed_ranges(void *info)
 void mtrr_save_fixed_ranges(void *info)
 {
 {
-	get_fixed_ranges(mtrr_state.fixed_ranges);
+	if (cpu_has_mtrr)
+		get_fixed_ranges(mtrr_state.fixed_ranges);
 }
 }
 
 
 static void print_fixed(unsigned base, unsigned step, const mtrr_type*types)
 static void print_fixed(unsigned base, unsigned step, const mtrr_type*types)