Re: [PATCH] [1/48] Suspend2 2.1.9.8 for 2.6.12: submit_intro

Pekka Enberg
2005-07-06T08:17:18Z

On 7/6/05, Nigel Cunningham <nigel@suspend2.net> wrote:
> diff -ruNp 300-reboot-handler-hook.patch-old/kernel/sys.c 300-reboot-handler-hook.patch-new/kernel/sys.c
> --- 300-reboot-handler-hook.patch-old/kernel/sys.c 2005-06-20 11:47:32.000000000 +1000
> +++ 300-reboot-handler-hook.patch-new/kernel/sys.c 2005-07-04 23:14:18.000000000 +1000
> @@ -436,12 +436,12 @@ asmlinkage long sys_reboot(int magic1, i
> machine_restart(buffer);
> break;
>
> -#ifdef CONFIG_SOFTWARE_SUSPEND
> +#ifdef CONFIG_SUSPEND2
> case LINUX_REBOOT_CMD_SW_SUSPEND:
> {
> - int ret = software_suspend();
> + suspend2_try_suspend();
> unlock_kernel();
> - return ret;

Are both mechanisms intended to live in the kernel? If not, where's
the patch to remove the old code?