Re: [Linaro-acpi] [RFC part3 PATCH 1/2] clocksource / arch_timer: Use ACPI GTDT table to initialize arch timer

On Tuesday 03 December 2013, Hanjun Guo wrote:

+#ifdef CONFIG_ACPI +void __init arch_timer_acpi_init(void) +{

...

+} +#else +void __init arch_timer_acpi_init(void) { return; }; +#endif

The #else clause is broken in combination with

diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index 6d26b40..2654edf 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -66,6 +66,11 @@ static inline struct timecounter *arch_timer_get_timecounter(void) return NULL; } +static inline void arch_timer_acpi_init(void) +{

• return;

+}

#endif

this inline function. Have you build-tested this with CONFIG_ACPI disabled?

Arnd