A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

x86, realmode: Unbreak the ia64 build of drivers/acpi/sleep.c

Browse source 
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 <[email protected]>
Originally-by: H. Peter Anvin <[email protected]>
Signed-off-by: Jarkko Sakkinen <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Cc: Tony Luck <[email protected]>
Cc: Len Brown <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
This commit is contained in:
H. Peter Anvin 2012-05-30 12:33:41 +03:00 • committed by H. Peter Anvin
commit 319b6ffc6d
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/acpi/sleep.c
View file

@ -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();