aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2013-11-27 14:08:31 +0000
committerGraeme Gregory <graeme.gregory@linaro.org>2013-11-28 09:19:59 +0000
commit15a550d62d5b73ae34b74423f29d5f04cc684cfc (patch)
tree1b86c7fa692bbfbcc4de64b20175e800f8f30d9d
parent1be0cd8f8262b8336057767d7707e5d952415baf (diff)
downloadleg-kernel-15a550d62d5b73ae34b74423f29d5f04cc684cfc.tar.gz
ARM: ACPI: define acpi_suspend_lowlevel as NULL for arm
We had a missing symbol so define this as NULL for arm as it is currenly unused on arm platform Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org> Acked-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-rw-r--r--arch/arm/include/asm/acpi.h2
-rw-r--r--drivers/acpi/plat/arm-core.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/include/asm/acpi.h b/arch/arm/include/asm/acpi.h
index 658edf1a0984..1b55be2c2b6e 100644
--- a/arch/arm/include/asm/acpi.h
+++ b/arch/arm/include/asm/acpi.h
@@ -105,7 +105,7 @@ extern struct acpi_arm_root acpi_arm_rsdp_info;
void arm_acpi_reserve_memory(void);
/* Low-level suspend routine. */
-extern int acpi_suspend_lowlevel(void);
+extern int (*acpi_suspend_lowlevel)(void);
extern void prefill_possible_map(void);
diff --git a/drivers/acpi/plat/arm-core.c b/drivers/acpi/plat/arm-core.c
index 8031ec3ab44f..bb37efeab70a 100644
--- a/drivers/acpi/plat/arm-core.c
+++ b/drivers/acpi/plat/arm-core.c
@@ -78,6 +78,12 @@ static u64 acpi_lapic_addr __initdata;
struct acpi_arm_root acpi_arm_rsdp_info; /* info about RSDP from FDT */
/*
+ * This function pointer is needed to be defined but for now will be NULL
+ * on arm where sleep is handled differently than x86
+ */
+int (*acpi_suspend_lowlevel)(void);
+
+/*
* Boot-time Configuration
*/