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

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

x86/apic: Switch wait_for_init_deassert() to a bool flag 



Now that there is only a single wait_for_init_deassert()
function, just convert the member of struct apic to a bool to
determine whether we need to wait for init_deassert to become
non-zero.

There are no more callers of default_wait_for_init_deassert(),
so fold it into the caller.

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.1402042354010.7839@chino.kir.corp.google.com


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

arch/x86/include/asm/apic.h

+1 −7
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ struct apic { 
	int trampoline_phys_low;

	int trampoline_phys_high;



	void (*wait_for_init_deassert)(atomic_t *deassert);

	bool wait_for_init_deassert;

	void (*smp_callin_clear_local_apic)(void);

	void (*inquire_remote_apic)(int apicid);
@@ -517,12 +517,6 @@ extern int default_cpu_present_to_apicid(int mps_cpu); 
extern int default_check_phys_apicid_present(int phys_apicid);

#endif



static inline void default_wait_for_init_deassert(atomic_t *deassert)

{

	while (!atomic_read(deassert))

		cpu_relax();

}



extern void generic_bigsmp_probe(void);

arch/x86/kernel/apic/apic_flat_64.c

+2 −2
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static struct apic apic_flat = { 


	.trampoline_phys_low		= DEFAULT_TRAMPOLINE_PHYS_LOW,

	.trampoline_phys_high		= DEFAULT_TRAMPOLINE_PHYS_HIGH,

	.wait_for_init_deassert		= NULL,

	.wait_for_init_deassert		= false,

	.smp_callin_clear_local_apic	= NULL,

	.inquire_remote_apic		= default_inquire_remote_apic,
@@ -314,7 +314,7 @@ static struct apic apic_physflat = { 


	.trampoline_phys_low		= DEFAULT_TRAMPOLINE_PHYS_LOW,

	.trampoline_phys_high		= DEFAULT_TRAMPOLINE_PHYS_HIGH,

	.wait_for_init_deassert		= NULL,

	.wait_for_init_deassert		= false,

	.smp_callin_clear_local_apic	= NULL,

	.inquire_remote_apic		= default_inquire_remote_apic,

arch/x86/kernel/apic/apic_noop.c

+1 −2
Original line number Diff line number Diff line
@@ -172,8 +172,7 @@ struct apic apic_noop = { 
	.trampoline_phys_low		= DEFAULT_TRAMPOLINE_PHYS_LOW,

	.trampoline_phys_high		= DEFAULT_TRAMPOLINE_PHYS_HIGH,



	.wait_for_init_deassert		= NULL,



	.wait_for_init_deassert		= false,

	.smp_callin_clear_local_apic	= NULL,

	.inquire_remote_apic		= NULL,

arch/x86/kernel/apic/apic_numachip.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static const struct apic apic_numachip __refconst = { 
	.wakeup_secondary_cpu		= numachip_wakeup_secondary,

	.trampoline_phys_low		= DEFAULT_TRAMPOLINE_PHYS_LOW,

	.trampoline_phys_high		= DEFAULT_TRAMPOLINE_PHYS_HIGH,

	.wait_for_init_deassert		= NULL,

	.wait_for_init_deassert		= false,

	.smp_callin_clear_local_apic	= NULL,

	.inquire_remote_apic		= NULL, /* REMRD not supported */

arch/x86/kernel/apic/bigsmp_32.c

+1 −2
Original line number Diff line number Diff line
@@ -199,8 +199,7 @@ static struct apic apic_bigsmp = { 
	.trampoline_phys_low		= DEFAULT_TRAMPOLINE_PHYS_LOW,

	.trampoline_phys_high		= DEFAULT_TRAMPOLINE_PHYS_HIGH,



	.wait_for_init_deassert		= default_wait_for_init_deassert,



	.wait_for_init_deassert		= true,

	.smp_callin_clear_local_apic	= NULL,

	.inquire_remote_apic		= default_inquire_remote_apic,