diff options
| author | H. Peter Anvin <hpa@kernel.org> | 2012-05-30 12:33:41 +0300 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-05-30 10:12:48 -0700 |
| commit | 319b6ffc6df892e4ccffff823cc5521a4a5d2dca (patch) | |
| tree | 6a1ff6351d37fab46b74caee92ce5e883085a4b4 /drivers/acpi | |
| parent | 731a7378b81c2f5fa88ca1ae20b83d548d5613dc (diff) | |
| download | linux-319b6ffc6df892e4ccffff823cc5521a4a5d2dca.tar.gz linux-319b6ffc6df892e4ccffff823cc5521a4a5d2dca.tar.bz2 linux-319b6ffc6df892e4ccffff823cc5521a4a5d2dca.zip | |
x86, realmode: Unbreak the ia64 build of drivers/acpi/sleep.c
Revert usage of acpi_wakeup_address and move definition
to x86 architecture code in order to make compilation work
in ia64.
[jsakkine: tested compilation in ia64/x86-64 and added
proper commit message]
Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Originally-by: H. Peter Anvin <hpa@kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
Link: http://lkml.kernel.org/r/1338370421-27735-1-git-send-email-jarkko.sakkinen@intel.com
Cc: Tony Luck <tony.luck@intel.com>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/sleep.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index ebaa04593236..74ee4ab577b6 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -25,8 +25,6 @@ #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> -#include <asm/realmode.h> - #include "internal.h" #include "sleep.h" @@ -93,13 +91,11 @@ 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 (!wakeup_pa) + if (!acpi_wakeup_address) return -EFAULT; - acpi_set_firmware_waking_vector( - (acpi_physical_address)wakeup_pa); + acpi_set_firmware_waking_vector(acpi_wakeup_address); } ACPI_FLUSH_CPU_CACHE(); |