Merge branch 'kconfig' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...

[linux-2.6] / include / asm-x86_64 / genapic.h

diff --git a/include/asm-x86_64/genapic.h b/include/asm-x86_64/genapic.h
index 81e714665344623c9990199a5faaee15261b397b..b80f4bb5f2733554f096788cb067b06519f1053c 100644 (file)
--- a/include/asm-x86_64/genapic.h
+++ b/include/asm-x86_64/genapic.h
@@ -18,6 +18,7 @@ struct genapic {
        u32 int_dest_mode;
        int (*apic_id_registered)(void);
        cpumask_t (*target_cpus)(void);
+       cpumask_t (*vector_allocation_domain)(int cpu);
        void (*init_apic_ldr)(void);
        /* ipi */
        void (*send_IPI_mask)(cpumask_t mask, int vector);
@@ -29,6 +30,6 @@ struct genapic {
 };
 
 
-extern struct genapic *genapic;
+extern struct genapic *genapic, *genapic_force, apic_flat;
 
 #endif