- acpi-suspend-fix-compilation-for-acpi_sleep-unset-and-xen_save_restore-set.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     ACPI suspend: fix compilation for ACPI_SLEEP unset and XEN_SAVE_RESTORE set
has been removed from the -mm tree.  Its filename was
     acpi-suspend-fix-compilation-for-acpi_sleep-unset-and-xen_save_restore-set.patch

This patch was dropped because it was merged into mainline or a subsystem tree

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
linux-next.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

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux