aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic_32.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/apic_32.c')
-rw-r--r--arch/x86/kernel/apic_32.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 4330a899ddcb..ffbad74e5be0 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -577,7 +577,6 @@ static void local_apic_timer_interrupt(void)
577 * [ if a single-CPU system runs an SMP kernel then we call the local 577 * [ if a single-CPU system runs an SMP kernel then we call the local
578 * interrupt as well. Thus we cannot inline the local irq ... ] 578 * interrupt as well. Thus we cannot inline the local irq ... ]
579 */ 579 */
580
581void smp_apic_timer_interrupt(struct pt_regs *regs) 580void smp_apic_timer_interrupt(struct pt_regs *regs)
582{ 581{
583 struct pt_regs *old_regs = set_irq_regs(regs); 582 struct pt_regs *old_regs = set_irq_regs(regs);
@@ -1021,7 +1020,7 @@ void __cpuinit setup_local_APIC(void)
1021/* 1020/*
1022 * Detect and initialize APIC 1021 * Detect and initialize APIC
1023 */ 1022 */
1024static int __init detect_init_APIC (void) 1023static int __init detect_init_APIC(void)
1025{ 1024{
1026 u32 h, l, features; 1025 u32 h, l, features;
1027 1026
@@ -1165,7 +1164,7 @@ fake_ioapic_page:
1165 * This initializes the IO-APIC and APIC hardware if this is 1164 * This initializes the IO-APIC and APIC hardware if this is
1166 * a UP kernel. 1165 * a UP kernel.
1167 */ 1166 */
1168int __init APIC_init_uniprocessor (void) 1167int __init APIC_init_uniprocessor(void)
1169{ 1168{
1170 if (enable_local_apic < 0) 1169 if (enable_local_apic < 0)
1171 clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC); 1170 clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);