diff --git a/[refs] b/[refs] index b2897eb0735f..1605f024977b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87ebecf14ca4f669cb52be46c954f3d9201394b8 +refs/heads/master: 3a12d93dc0b46bc710317272bf91640d7a8b6f18 diff --git a/trunk/arch/x86/kernel/apic_64.c b/trunk/arch/x86/kernel/apic_64.c index 032bf1e765df..5bf329ed9d78 100644 --- a/trunk/arch/x86/kernel/apic_64.c +++ b/trunk/arch/x86/kernel/apic_64.c @@ -923,7 +923,7 @@ void setup_APIC_extended_lvt(unsigned char lvt_off, unsigned char vector, * value into /proc/profile. */ -void smp_local_timer_interrupt(void) +static void smp_local_timer_interrupt(void) { int cpu = smp_processor_id(); struct clock_event_device *evt = &per_cpu(lapic_events, cpu); diff --git a/trunk/include/asm-x86/apic.h b/trunk/include/asm-x86/apic.h index c064c1f84bab..d0a221fa1fc3 100644 --- a/trunk/include/asm-x86/apic.h +++ b/trunk/include/asm-x86/apic.h @@ -112,7 +112,6 @@ extern void sync_Arb_IDs(void); extern void init_bsp_APIC(void); extern void setup_local_APIC(void); extern void init_apic_mappings(void); -extern void smp_local_timer_interrupt(void); extern void setup_boot_APIC_clock(void); extern void setup_secondary_APIC_clock(void); extern int APIC_init_uniprocessor(void);