vserver 1.9.5.x5

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

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 847a90e..0a5d2a9 100644 (file)
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -1,6 +1,7 @@
 /*
  * sleep.c - ACPI sleep support.
  *
+ * Copyright (c) 2004 David Shaohua Li <shaohua.li@intel.com>
  * Copyright (c) 2000-2003 Patrick Mochel
  * Copyright (c) 2003 Open Source Development Lab
  *
@@ -13,6 +14,7 @@
 #include <linux/dmi.h>
 #include <linux/device.h>
 #include <linux/suspend.h>
+#include <asm/io.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include "sleep.h"
@@ -42,7 +44,7 @@ static int init_8259A_after_S1;
  *     wakeup code to the waking vector. 
  */
 
-static int acpi_pm_prepare(u32 pm_state)
+static int acpi_pm_prepare(suspend_state_t pm_state)
 {
        u32 acpi_state = acpi_suspend_states[pm_state];
 
@@ -56,7 +58,8 @@ static int acpi_pm_prepare(u32 pm_state)
                if (!acpi_wakeup_address)
                        return -EFAULT;
                acpi_set_firmware_waking_vector(
-                       (acpi_physical_address) acpi_wakeup_address);
+                       (acpi_physical_address) virt_to_phys(
+                               (void *)acpi_wakeup_address));
        }
        ACPI_FLUSH_CPU_CACHE();
        acpi_enable_wakeup_device_prep(acpi_state);
@@ -74,7 +77,7 @@ static int acpi_pm_prepare(u32 pm_state)
  *     It's unfortunate, but it works. Please fix if you're feeling frisky.
  */
 
-static int acpi_pm_enter(u32 pm_state)
+static int acpi_pm_enter(suspend_state_t pm_state)
 {
        acpi_status status = AE_OK;
        unsigned long flags = 0;
@@ -136,7 +139,7 @@ static int acpi_pm_enter(u32 pm_state)
  *     failed). 
  */
 
-static int acpi_pm_finish(u32 pm_state)
+static int acpi_pm_finish(suspend_state_t pm_state)
 {
        u32 acpi_state = acpi_suspend_states[pm_state];
 
@@ -156,7 +159,7 @@ static int acpi_pm_finish(u32 pm_state)
 
 int acpi_suspend(u32 acpi_state)
 {
-       u32 states[] = {
+       suspend_state_t states[] = {
                [1]     = PM_SUSPEND_STANDBY,
                [3]     = PM_SUSPEND_MEM,
                [4]     = PM_SUSPEND_DISK,