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

Commit 8d77010f authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: include mach_wakecpu.h in smpboot_64 



Do it and also fix conflicts, which automatically makes
x86_64 look closer to i386

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

arch/x86/kernel/smpboot_64.c

+3 −8
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
#include <asm/hw_irq.h>

#include <asm/numa.h>



#include <mach_wakecpu.h>



/* Set when the idlers are all forked */

int smp_threads_ready;
@@ -85,13 +87,6 @@ struct task_struct *idle_thread_array[NR_CPUS] __cpuinitdata ; 
#define set_idle_for_cpu(x,p)   (idle_thread_array[(x)] = (p))

#endif



static inline void wait_for_init_deassert(atomic_t *deassert)

{

	while (!atomic_read(deassert))

		cpu_relax();

	return;

}



static atomic_t init_deasserted __cpuinitdata;



/*
@@ -247,7 +242,7 @@ extern volatile unsigned long init_rsp; 
extern void (*initial_code)(void);



#ifdef APIC_DEBUG

static void inquire_remote_apic(int apicid)

static void __inquire_remote_apic(int apicid)

{

	unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 };

	char *names[] = { "ID", "VERSION", "SPIV" };