The patch titled ACPI suspend: fix compilation for ACPI_SLEEP unset and XEN_SAVE_RESTORE set has been added to the -mm tree. Its filename is acpi-suspend-fix-compilation-for-acpi_sleep-unset-and-xen_save_restore-set.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ACPI suspend: fix compilation for ACPI_SLEEP unset and XEN_SAVE_RESTORE set From: "Rafael J. Wysocki" <rjw@xxxxxxx> Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> Cc: Len Brown <lenb@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/acpi/sleep/main.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN drivers/acpi/sleep/main.c~acpi-suspend-fix-compilation-for-acpi_sleep-unset-and-xen_save_restore-set drivers/acpi/sleep/main.c --- a/drivers/acpi/sleep/main.c~acpi-suspend-fix-compilation-for-acpi_sleep-unset-and-xen_save_restore-set +++ a/drivers/acpi/sleep/main.c @@ -163,6 +163,8 @@ static void acpi_pm_end(void) acpi_target_sleep_state = ACPI_STATE_S0; acpi_sleep_tts_switch(acpi_target_sleep_state); } +#else /* !CONFIG_ACPI_SLEEP */ +#define acpi_target_sleep_state ACPI_STATE_S0 #endif /* CONFIG_ACPI_SLEEP */ #ifdef CONFIG_SUSPEND _ Patches currently in -mm which might be from rjw@xxxxxxx are origin.patch acpi-suspend-fix-compilation-for-acpi_sleep-unset-and-xen_save_restore-set.patch skge-adapt-skge-to-use-reworked-pci-pm.patch e100-adapt-to-the-reworked-pci-pm.patch shrink_slab-handle-bad-shrinkers.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html