From: Al Stone ahs3@redhat.com
This code will be handled in a different manner (either PSCI or other kernel code) so is not needed for ARMv7/v8 systems.
Signed-off-by: Al Stone al.stone@linaro.org --- arch/arm/include/asm/acpi.h | 7 ------- arch/arm64/include/asm/acpi.h | 7 ------- drivers/acpi/sleep.c | 2 ++ 3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/arch/arm/include/asm/acpi.h b/arch/arm/include/asm/acpi.h index a6989d8..7907c81 100644 --- a/arch/arm/include/asm/acpi.h +++ b/arch/arm/include/asm/acpi.h @@ -118,13 +118,6 @@ extern int acpi_suspend_lowlevel(void);
extern void prefill_possible_map(void);
-/* Physical address to resume after wakeup */ -/* BOZO: was... -#define acpi_wakeup_address ((unsigned long)(real_mode_header->wakeup_start)) -*/ -#define acpi_wakeup_address (0) - - static inline void disable_acpi(void) { acpi_disabled = 1; diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index c1dc30d..0409796 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -96,13 +96,6 @@ extern int acpi_suspend_lowlevel(void);
extern void prefill_possible_map(void);
-/* Physical address to resume after wakeup */ -/* BOZO: was... -#define acpi_wakeup_address ((unsigned long)(real_mode_header->wakeup_start)) -*/ -#define acpi_wakeup_address (0) - - static inline void disable_acpi(void) { acpi_disabled = 1; diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 721e949..0847fd6 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -58,6 +58,7 @@ static struct notifier_block tts_notifier = {
static int acpi_sleep_prepare(u32 acpi_state) { +#if !(defined(CONFIG_ARM) || defined(CONFIG_ARM64)) #ifdef CONFIG_ACPI_SLEEP /* do we have a wakeup address for S2 and S3? */ if (acpi_state == ACPI_STATE_S3) { @@ -68,6 +69,7 @@ static int acpi_sleep_prepare(u32 acpi_state) } ACPI_FLUSH_CPU_CACHE(); #endif +#endif printk(KERN_INFO PREFIX "Preparing to enter system sleep state S%d\n", acpi_state); acpi_enable_wakeup_devices(acpi_state);