- Update Xen patches to 3.3-rc5 and c/s 1157.

[linux-flexiantxendom0-3.2.10.git] / drivers / acpi / sleep.c

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index ca191ff..40eb032 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -61,6 +61,7 @@ static struct notifier_block tts_notifier = {
 static int acpi_sleep_prepare(u32 acpi_state)
 {
 #ifdef CONFIG_ACPI_SLEEP
+#ifndef CONFIG_ACPI_PV_SLEEP
        /* do we have a wakeup address for S2 and S3? */
        if (acpi_state == ACPI_STATE_S3) {
                if (!acpi_wakeup_address) {
@@ -70,6 +71,7 @@ static int acpi_sleep_prepare(u32 acpi_state)
                                (acpi_physical_address)acpi_wakeup_address);
 
        }
+#endif
        ACPI_FLUSH_CPU_CACHE();
 #endif
        printk(KERN_INFO PREFIX "Preparing to enter system sleep state S%d\n",