diff --git a/[refs] b/[refs] index dff0effa7d31..ba667e744f0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 505deeb1a228e5b0bf6ac5d0d78f4a4253a9efe9 +refs/heads/master: 6781d948cc05b02df915650f2eb49550a1631df9 diff --git a/trunk/arch/x86/include/asm/genapic.h b/trunk/arch/x86/include/asm/genapic.h index 19a5193e9651..c27efde0523d 100644 --- a/trunk/arch/x86/include/asm/genapic.h +++ b/trunk/arch/x86/include/asm/genapic.h @@ -73,7 +73,6 @@ struct genapic { unsigned int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask, const struct cpumask *andmask); -#ifdef CONFIG_SMP /* ipi */ void (*send_IPI_mask)(const struct cpumask *mask, int vector); void (*send_IPI_mask_allbutself)(const struct cpumask *mask, @@ -81,7 +80,7 @@ struct genapic { void (*send_IPI_allbutself)(int vector); void (*send_IPI_all)(int vector); void (*send_IPI_self)(int vector); -#endif + /* wakeup_secondary_cpu */ int (*wakeup_cpu)(int apicid, unsigned long start_eip);