Merge branch 'master' of ../mmc

[firefly-linux-kernel-4.4.55.git] / arch / x86 / include / asm / genapic_32.h

diff --git a/arch/x86/include/asm/genapic_32.h b/arch/x86/include/asm/genapic_32.h
index 39bd8c1db3f5fecf26ba2ace87822e531dcc045f..0ac17d33a8c7114a015ba2bb4971e3b5e381a6da 100644 (file)
--- a/arch/x86/include/asm/genapic_32.h
+++ b/arch/x86/include/asm/genapic_32.h
@@ -66,6 +66,7 @@ struct genapic {
        void (*send_IPI_allbutself)(int vector);
        void (*send_IPI_all)(int vector);
 #endif
+       int (*wakeup_cpu)(int apicid, unsigned long start_eip);
        int trampoline_phys_low;
        int trampoline_phys_high;
        void (*wait_for_init_deassert)(atomic_t *deassert);
@@ -130,6 +131,7 @@ struct genapic {
 }
 
 extern struct genapic *genapic;
+extern void es7000_update_genapic_to_cluster(void);
 
 enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC};
 #define get_uv_system_type()           UV_NONE