diff options
| author | David Rientjes <rientjes@google.com> | 2014-02-04 23:54:58 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-09 15:15:07 +0100 |
| commit | d3c63ae1e2e35e4250390c079dc3fb7291347f5c (patch) | |
| tree | 26cccf9c74d11e0a9c48bacb13d7705752fd4880 /arch/x86/kernel/apic | |
| parent | 494479038d97f1b9f76fc633a360a681acdf035c (diff) | |
| download | linux-d3c63ae1e2e35e4250390c079dc3fb7291347f5c.tar.bz2 | |
x86/apic: Only use default_wait_for_init_deassert()
es7000_wait_for_init_deassert() is functionally equivalent to
default_wait_for_init_deassert(), so remove the duplicate code
and use only a single function.
Signed-off-by: David Rientjes <rientjes@google.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1402042353030.7839@chino.kir.corp.google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/apic')
| -rw-r--r-- | arch/x86/kernel/apic/es7000_32.c | 8 |
1 files changed, 1 insertions, 7 deletions
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) WARN(1, "Command failed, status = %x\n", mip_status); } -static void es7000_wait_for_init_deassert(atomic_t *deassert) -{ - while (!atomic_read(deassert)) - cpu_relax(); -} - static unsigned int es7000_get_apic_id(unsigned long x) { return (x >> 24) & 0xFF; @@ -722,7 +716,7 @@ static struct apic __refdata apic_es7000 = { .trampoline_phys_low = 0x467, .trampoline_phys_high = 0x469, - .wait_for_init_deassert = es7000_wait_for_init_deassert, + .wait_for_init_deassert = default_wait_for_init_deassert, /* Nothing to do for most platforms, since cleared by the INIT cycle: */ .smp_callin_clear_local_apic = NULL, |