Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / acpi / sleep.c

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index eb6fd23..ebaa045 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -25,6 +25,8 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#include <asm/realmode.h>
+
 #include "internal.h"
 #include "sleep.h"
 
@@ -91,13 +93,13 @@ static struct notifier_block tts_notifier = {
 static int acpi_sleep_prepare(u32 acpi_state)
 {
 #ifdef CONFIG_ACPI_SLEEP
+       unsigned long wakeup_pa = real_mode_header->wakeup_start;
        /* do we have a wakeup address for S2 and S3? */
        if (acpi_state == ACPI_STATE_S3) {
-               if (!acpi_wakeup_address) {
+               if (!wakeup_pa)
                        return -EFAULT;
-               }
                acpi_set_firmware_waking_vector(
-                               (acpi_physical_address)acpi_wakeup_address);
+                               (acpi_physical_address)wakeup_pa);
 
        }
        ACPI_FLUSH_CPU_CACHE();
@@ -887,7 +889,7 @@ int __init acpi_sleep_init(void)
                status = acpi_get_sleep_type_data(i, &type_a, &type_b);
                if (ACPI_SUCCESS(status)) {
                        sleep_states[i] = 1;
-                       printk(" S%d", i);
+                       printk(KERN_CONT " S%d", i);
                }
        }
 
@@ -901,7 +903,7 @@ int __init acpi_sleep_init(void)
                hibernation_set_ops(old_suspend_ordering ?
                        &acpi_hibernation_ops_old : &acpi_hibernation_ops);
                sleep_states[ACPI_STATE_S4] = 1;
-               printk(" S4");
+               printk(KERN_CONT " S4");
                if (!nosigcheck) {
                        acpi_get_table(ACPI_SIG_FACS, 1,
                                (struct acpi_table_header **)&facs);
@@ -914,11 +916,11 @@ int __init acpi_sleep_init(void)
        status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
        if (ACPI_SUCCESS(status)) {
                sleep_states[ACPI_STATE_S5] = 1;
-               printk(" S5");
+               printk(KERN_CONT " S5");
                pm_power_off_prepare = acpi_power_off_prepare;
                pm_power_off = acpi_power_off;
        }
-       printk(")\n");
+       printk(KERN_CONT ")\n");
        /*
         * Register the tts_notifier to reboot notifier list so that the _TTS
         * object can also be evaluated when the system enters S5.