Re: [PATCH] [11/48] Suspend2 2.1.9.8 for 2.6.12: 401-e820-table-support.patch

Zwane Mwaikambo
2005-07-06T05:23:07Z

On Wed, 6 Jul 2005, Nigel Cunningham wrote:

> diff -ruNp 402-mtrr-remove-sysdev.patch-old/arch/i386/kernel/cpu/mtrr/main.c 402-mtrr-remove-sysdev.patch-new/arch/i386/kernel/cpu/mtrr/main.c
> --- 402-mtrr-remove-sysdev.patch-old/arch/i386/kernel/cpu/mtrr/main.c 2005-06-20 11:46:42.000000000 +1000
> +++ 402-mtrr-remove-sysdev.patch-new/arch/i386/kernel/cpu/mtrr/main.c 2005-07-04 23:14:19.000000000 +1000
> @@ -166,7 +166,6 @@ static void ipi_handler(void *info)
> atomic_dec(&data->count);
> local_irq_restore(flags);
> }
> -
> #endif
>
> /**
> @@ -560,7 +559,7 @@ struct mtrr_value {
>
> static struct mtrr_value * mtrr_state;
>
> -static int mtrr_save(struct sys_device * sysdev, u32 state)
> +int mtrr_save(void)
> {
> int i;
> int size = num_var_ranges * sizeof(struct mtrr_value);
> @@ -580,28 +579,27 @@ static int mtrr_save(struct sys_device *
> return 0;
> }

Isn't this covered by Shaohua Li's patch?