From d8275a776a5df506aaab4745749333f23e59151d Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 1 Jul 2007 12:06:48 -0700 Subject: [PATCH] --- yaml --- r: 58123 b: refs/heads/master c: 84288ad89e9736c7478e138f247397b9ab7a9d28 h: refs/heads/master i: 58121: a8aca43be1af8ce3f4716fd23a571181e7492f6e 58119: ec0a1bcc8ff8a18ee2349c284bf2675daeeb11bd v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/cpu/mtrr/generic.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ab743d639d61..ca5076a1b17a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ebffd7c05391693b71d3326c8c78ff82f728ed0 +refs/heads/master: 84288ad89e9736c7478e138f247397b9ab7a9d28 diff --git a/trunk/arch/i386/kernel/cpu/mtrr/generic.c b/trunk/arch/i386/kernel/cpu/mtrr/generic.c index 5a551fb7ea7b..f6e46943e6ef 100644 --- a/trunk/arch/i386/kernel/cpu/mtrr/generic.c +++ b/trunk/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)