On 2013年12月05日 11:43, Arnd Bergmann wrote:
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; }; +#endifThe #else clause is broken in combination withdiff --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; +} + #endifthis inline function. Have you build-tested this with CONFIG_ACPI disabled?
Good catch! Thank you very much, will fix it in next version. Thanks hanjun -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

