aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/apic.h1
-rw-r--r--arch/x86/kernel/apic/es7000_32.c8
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 1d2091a226bc..2ef701381e2a 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -521,7 +521,6 @@ static inline void default_wait_for_init_deassert(atomic_t *deassert)
521{ 521{
522 while (!atomic_read(deassert)) 522 while (!atomic_read(deassert))
523 cpu_relax(); 523 cpu_relax();
524 return;
525} 524}
526 525
527extern void generic_bigsmp_probe(void); 526extern void generic_bigsmp_probe(void);
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index c55224731b2d..d03d57e0a806 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -394,12 +394,6 @@ static void es7000_enable_apic_mode(void)
394 WARN(1, "Command failed, status = %x\n", mip_status); 394 WARN(1, "Command failed, status = %x\n", mip_status);
395} 395}
396 396
397static void es7000_wait_for_init_deassert(atomic_t *deassert)
398{
399 while (!atomic_read(deassert))
400 cpu_relax();
401}
402
403static unsigned int es7000_get_apic_id(unsigned long x) 397static unsigned int es7000_get_apic_id(unsigned long x)
404{ 398{
405 return (x >> 24) & 0xFF; 399 return (x >> 24) & 0xFF;
@@ -722,7 +716,7 @@ static struct apic __refdata apic_es7000 = {
722 .trampoline_phys_low = 0x467, 716 .trampoline_phys_low = 0x467,
723 .trampoline_phys_high = 0x469, 717 .trampoline_phys_high = 0x469,
724 718
725 .wait_for_init_deassert = es7000_wait_for_init_deassert, 719 .wait_for_init_deassert = default_wait_for_init_deassert,
726 720
727 /* Nothing to do for most platforms, since cleared by the INIT cycle: */ 721 /* Nothing to do for most platforms, since cleared by the INIT cycle: */
728 .smp_callin_clear_local_apic = NULL, 722 .smp_callin_clear_local_apic = NULL,