2002-11-14 03:52:00

by Shawn Starr

Subject: [RFC][PATCH] Fix drivers/acpi/sleep.c compile error if swsusp is disabled

Hi, this should fix this compile problem (if this is correct).

Please apply.

Shawn.

diff -urpN linux-2.5.47-vanilla/drivers/acpi/sleep.c linux-2.5.47-fixes/drivers/acpi/sleep.c
--- linux-2.5.47-vanilla/drivers/acpi/sleep.c 2002-11-13 22:40:07.000000000 -0500
+++ linux-2.5.47-fixes/drivers/acpi/sleep.c 2002-11-13 22:55:25.000000000 -0500
@@ -205,8 +205,10 @@ acpi_system_suspend(
break;

case ACPI_STATE_S2:
+#ifdef CONFIG_SOFTWARE_SUSPEND
case ACPI_STATE_S3:
do_suspend_lowlevel(0);
+#endif
break;
}
local_irq_restore(flags);

2002-11-15 11:31:22

by Pavel Machek

Subject: Re: [RFC][PATCH] Fix drivers/acpi/sleep.c compile error if swsusp is disabled

Hi!

> Hi, this should fix this compile problem (if this is correct).
>
> Please apply.

It would silently do nothing, that's bad.

Could you make it so that CONFIG_ACPI_SLEEP is not selectable without
CONFIG_SOFTWARE_SUSPEND and move CONFIG_SOFTWARE_SUSPEND into "power
managment" submenu?
Pavel
> break;
>
> case ACPI_STATE_S2:
> +#ifdef CONFIG_SOFTWARE_SUSPEND
> case ACPI_STATE_S3:
> do_suspend_lowlevel(0);
> +#endif
> break;
> }
> local_irq_restore(flags);
>
>

--
When do you have heart between your knees?

2002-11-16 05:06:01

by Shawn Starr

Subject: Re: [RFC][PATCH] Fix drivers/acpi/sleep.c compile error if swsusp is disabled

I can fix this, sure. I'll have a fix later today or so.

On November 14, 2002 05:59 pm, Pavel Machek wrote:
> Hi!
>
> > Hi, this should fix this compile problem (if this is correct).
> >
> > Please apply.
>
> It would silently do nothing, that's bad.
>
> Could you make it so that CONFIG_ACPI_SLEEP is not selectable without
> CONFIG_SOFTWARE_SUSPEND and move CONFIG_SOFTWARE_SUSPEND into "power
> managment" submenu?
> Pavel
>
> > break;
> >
> > case ACPI_STATE_S2:
> > +#ifdef CONFIG_SOFTWARE_SUSPEND
> > case ACPI_STATE_S3:
> > do_suspend_lowlevel(0);
> > +#endif
> > break;
> > }
> > local_irq_restore(flags);