Responding to various proposed fixes:
> Index: linux/arch/i386/kernel/cpu/mtrr/main.c
> ===================================================================
> --- linux.orig/arch/i386/kernel/cpu/mtrr/main.c
> +++ linux/arch/i386/kernel/cpu/mtrr/main.c
> @@ -734,8 +734,11 @@ void mtrr_ap_init(void)
> */
> void mtrr_save_state(void)
> {
> - int cpu = get_cpu();
> + int cpu;
>
> + if (!cpu_has_mtrr)
> + return;
> + cpu = get_cpu();
> if (cpu == 0)
> mtrr_save_fixed_ranges(NULL);
> else
This does not change the symptoms in any way.
> --- a/arch/i386/kernel/cpu/mtrr/generic.c~i386-mtrr-crash-fix
> +++ a/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)
This works great, thanks! Please consider the regression diagnosed and fixed.
_______________________________________________
linux-pm mailing list
linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/linux-pm
