From: Andrew Morton arch/x86_64/kernel/apic.c:45: error: static declaration of 'disable_apic_timer' follows non-static declaration include/asm/apic.h:22: error: previous declaration of 'disable_apic_timer' was here Cc: Thomas Gleixner Signed-off-by: Andrew Morton --- arch/x86_64/kernel/apic.c | 2 +- asm-x86_64/apic.h | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff -puN arch/x86_64/kernel/apic.c~x86_64-cleanup-apic-c-fix arch/x86_64/kernel/apic.c --- a/arch/x86_64/kernel/apic.c~x86_64-cleanup-apic-c-fix +++ a/arch/x86_64/kernel/apic.c @@ -42,7 +42,7 @@ int apic_verbosity; static int apic_calibrate_pmtmr __initdata; -static int disable_apic_timer __initdata; +int disable_apic_timer __initdata; /* Local APIC timer works in C2? */ int local_apic_timer_c2_ok; diff -puN include/asm-x86_64/apic.h~x86_64-cleanup-apic-c-fix include/asm-x86_64/apic.h _