On Wed, Nov 27, 2013 at 04:35:19PM +0100, Tomasz Nowicki wrote:
Hi Graeme,
On 27.11.2013 15:10, Graeme Gregory wrote:
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
drivers/acpi/processor_idle.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 0ff1927..208503d 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -218,18 +218,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;
@@ -254,7 +252,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)
I think this is fixed by Al second version of Hardware Reduced patch set: [PATCH v2 2/6] ACPI: bus master reload not supported in reduced HW mode
Unless you just want to make it works for our three which has first patch version?
I think Als second version is still broken as its missing the two above stubs which are needed for compile on armv7 due to CONFIG_PM_SLEEP code paths being exposed.
But this is a diff to our internal tree which has an older version!
Graeme