Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3c63ae1 authored by David Rientjes's avatar David Rientjes Committed by Ingo Molnar
Browse files

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: default avatarDavid Rientjes <rientjes@google.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1402042353030.7839@chino.kir.corp.google.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 49447903

arch/x86/include/asm/apic.h

+0 −1
Original line number Diff line number Diff line
@@ -521,7 +521,6 @@ static inline void default_wait_for_init_deassert(atomic_t *deassert) 
{

	while (!atomic_read(deassert))

		cpu_relax();

	return;

}



extern void generic_bigsmp_probe(void);

arch/x86/kernel/apic/es7000_32.c

+1 −7
Original line number Diff line number Diff line
@@ -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,