diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2007-07-01 12:06:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-01 12:29:44 -0700 |
| commit | 84288ad89e9736c7478e138f247397b9ab7a9d28 (patch) | |
| tree | 99f7757516d3d9fe85a16560d09479b5a29b0cbf /arch | |
| parent | 5ebffd7c05391693b71d3326c8c78ff82f728ed0 (diff) | |
| download | linux-stable-84288ad89e9736c7478e138f247397b9ab7a9d28.tar.gz linux-stable-84288ad89e9736c7478e138f247397b9ab7a9d28.tar.bz2 linux-stable-84288ad89e9736c7478e138f247397b9ab7a9d28.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/cpu/mtrr/generic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/mtrr/generic.c b/arch/i386/kernel/cpu/mtrr/generic.c index 5a551fb7ea7b..f6e46943e6ef 100644 --- a/arch/i386/kernel/cpu/mtrr/generic.c +++ b/arch/i386/kernel/cpu/mtrr/generic.c @@ -65,7 +65,8 @@ get_fixed_ranges(mtrr_type * frs) 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) |