iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: include mach_wakecpu.h in smpboot_64

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

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Glauber de Oliveira Costa 2008-03-19 14:25:31 -03:00 committed by Ingo Molnar
parent ee09efc3e4
commit 8d77010f8c
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kernel/smpboot_64.c
View File

@ -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" };