Skip to contentSkip to conversation

Fix drivers/acpi/sleep.c compile error if swsusp is disabled

RFC PATCH In review Shawn Starr 2 participants 3 messages Nov 14, 2002 – Nov 16, 2002 ACPI

lore
Share & tools
lore

Shawn Starr

author
#0 lore raw

RFC PATCH 1/1 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.

drivers/acpi/sleep.c 2002-11-13 22:55:25.000000000 -0500 renamed from drivers/acpi/sleep.c 2002-11-13 22:40:07.000000000 -0500 +2 -0
diff -urpN  linux-2.5.47-vanilla/drivers/acpi/sleep.c linux-2.5.47-fixes/drivers/acpi/sleep.c
@@ -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);
#1 lore raw

Hi!

Quoted 3 lines

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

Quoted 12 lines
                break;

        case ACPI_STATE_S2:
drivers/acpi/sleep.c 2002-11-13 22:55:25.000000000 -0500 renamed from drivers/acpi/sleep.c 2002-11-13 22:40:07.000000000 -0500 +2 -0
+#ifdef CONFIG_SOFTWARE_SUSPEND
        case ACPI_STATE_S3:
                do_suspend_lowlevel(0);
+#endif
                break;
        }
        local_irq_restore(flags);
Signature · 1 line
When do you have heart between your knees?
author
#2 lore raw

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

Quoted 23 lines · Pavel Machek

Hi!

Quoted 3 lines

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

Quoted 10 lines
                break;

        case ACPI_STATE_S2:
drivers/acpi/sleep.c 2002-11-13 22:55:25.000000000 -0500 renamed from drivers/acpi/sleep.c 2002-11-13 22:40:07.000000000 -0500 +2 -0
+#ifdef CONFIG_SOFTWARE_SUSPEND
        case ACPI_STATE_S3:
                do_suspend_lowlevel(0);
+#endif
                break;
        }
        local_irq_restore(flags);