aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2013-11-27 14:07:13 +0000
committerGraeme Gregory <graeme.gregory@linaro.org>2013-11-28 09:19:58 +0000
commit1be0cd8f8262b8336057767d7707e5d952415baf (patch)
treeff6313b654b5bf6051b1d009b7dc0d5d70269f32
parentf75b61a51d7b3036d7a0ac63da9c89d1aaa77517 (diff)
downloadleg-kernel-1be0cd8f8262b8336057767d7707e5d952415baf.tar.gz
ACPI: process_idle repair hardware reduced compile issue
It is not valid to use the acpica macros to try and remove functions they only work on prototypes. Instead just increase the scope of the Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org> Acked-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-rw-r--r--drivers/acpi/processor_idle.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index da9c8bcbd461..751cde799a4c 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -207,18 +207,16 @@ static void lapic_timer_state_broadcast(struct acpi_processor *pr,
#endif
-#ifdef CONFIG_PM_SLEEP
-#if (!ACPI_REDUCED_HARDWARE)
+#if IS_ENABLED(CONFIG_PM_SLEEP) && !IS_ENABLED(CONFIG_ACPI_REDUCED_HARDWARE)
static u32 saved_bm_rld;
-#endif
-ACPI_HW_DEPENDENT_RETURN_INT(int acpi_processor_suspend(void))
+int acpi_processor_suspend(void)
{
acpi_read_bit_register(ACPI_BITREG_BUS_MASTER_RLD, &saved_bm_rld);
return 0;
}
-ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_processor_resume(void))
+void acpi_processor_resume(void)
{
u32 resumed_bm_rld;
@@ -243,7 +241,13 @@ void acpi_processor_syscore_exit(void)
{
unregister_syscore_ops(&acpi_processor_syscore_ops);
}
-#endif /* CONFIG_PM_SLEEP */
+
+#else
+
+void acpi_processor_syscore_init(void){}
+void acpi_processor_syscore_exit(void){}
+
+#endif /* CONFIG_PM_SLEEP && !CONFIG_ACPI_REDUCED_HARDWARE */
#if defined(CONFIG_X86)
static void tsc_check_state(int state)