Re: -mm swsusp: fix highmem handling

From: Andrew Morton
Date: Mon Aug 09 2004 - 16:47:51 EST


Pavel Machek <pavel@xxxxxx> wrote:
>
> This fixes highmem handling, and adds some comments so that others do
> not fall into the same trap I fallen in: code does not continue below
> swsusp_arch_resume if things go okay.
>
> Please apply,
> Pavel
>
> --- clean-mm/kernel/power/swsusp.c 2004-07-28 23:39:49.000000000 +0200
> +++ linux-mm/kernel/power/swsusp.c 2004-08-09 11:54:04.000000000 +0200
> @@ -870,8 +866,12 @@
> local_irq_disable();
> save_processor_state();
> error = swsusp_arch_suspend();
> + /* Restore control flow magically appears here */
> restore_processor_state();
> local_irq_enable();
> +#ifdef CONFIG_HIGHMEM
> + restore_highmem();
> +#endif
> return error;

restore_highmem() is a noop if !CONFIG_HIGHMEM, so I shall remove the
above ifdef/endif.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/