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

Commit e90009bc authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: use wait_for_init_deassert in x86_64 



wraps the busy loop for wait_for_init_deasserted() in a function,
so smp_callin in x86_64 looks like more i386

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 91718e8d

arch/x86/kernel/smpboot_64.c

+8 −2
Original line number Diff line number Diff line
@@ -100,6 +100,13 @@ static void __cpuinit smp_store_cpu_info(int id) 
	print_cpu_info(c);

}



static inline void wait_for_init_deassert(atomic_t *deassert)

{

	while (!atomic_read(deassert))

		cpu_relax();

	return;

}



static atomic_t init_deasserted __cpuinitdata;



/*
@@ -117,8 +124,7 @@ void __cpuinit smp_callin(void) 
	 * our local APIC.  We have to wait for the IPI or we'll

	 * lock up on an APIC access.

	 */

	while (!atomic_read(&init_deasserted))

		cpu_relax();

	wait_for_init_deassert(&init_deasserted);



	/*

	 * (This works even if the APIC is not enabled.)