diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-05 20:08:38 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-05 20:08:38 (GMT) |
| commit | 537388bb6563bfde7c0307b95ecc1f7a1ae39b02 (patch) | |
| tree | 7ca5fd476ef71cab2064d716046be4cc281f918b /drivers | |
| parent | 20cbc972617069c1ed434f62151e4de57d26ea46 (diff) | |
| parent | a1716d508abf77e4bd02c275ab9293b9866929f3 (diff) | |
| download | linux-537388bb6563bfde7c0307b95ecc1f7a1ae39b02.tar.xz | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86 ACPI: fix resume from suspend to RAM on uniprocessor x86-64
x86 ACPI: normalize segment descriptor register on resume
Diffstat (limited to 'drivers')
| -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 c3b0cd8..495c63a 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) if (!acpi_wakeup_address) { return -EFAULT; } - acpi_set_firmware_waking_vector((acpi_physical_address) - virt_to_phys((void *) - acpi_wakeup_address)); + acpi_set_firmware_waking_vector( + (acpi_physical_address)acpi_wakeup_address); } ACPI_FLUSH_CPU_CACHE(); |