diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-05 02:42:45 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-05 02:42:45 -0400 |
commit | a1716d508abf77e4bd02c275ab9293b9866929f3 (patch) | |
tree | 57195a0cfc8bdc353f163a8b3b53c8d99c2562e8 /drivers/acpi/sleep/main.c | |
parent | 64e83b5a919a65eb35b63dd7e07c188379ff8ce6 (diff) | |
parent | 4b4f7280d7fd1feeff134c2cf2db32fd583b6c29 (diff) |
Merge branch 'x86/s2ram-fix' into x86/urgent
Diffstat (limited to 'drivers/acpi/sleep/main.c')
-rw-r--r-- | drivers/acpi/sleep/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index c3b0cd88d09f..495c63a3e0af 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
@@ -36,9 +36,8 @@ static int acpi_sleep_prepare(u32 acpi_state) | |||
36 | if (!acpi_wakeup_address) { | 36 | if (!acpi_wakeup_address) { |
37 | return -EFAULT; | 37 | return -EFAULT; |
38 | } | 38 | } |
39 | acpi_set_firmware_waking_vector((acpi_physical_address) | 39 | acpi_set_firmware_waking_vector( |
40 | virt_to_phys((void *) | 40 | (acpi_physical_address)acpi_wakeup_address); |
41 | acpi_wakeup_address)); | ||
42 | 41 | ||
43 | } | 42 | } |
44 | ACPI_FLUSH_CPU_CACHE(); | 43 | ACPI_FLUSH_CPU_CACHE(); |