Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / arch / x86 / include / asm / apic.h

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index bc27611fa58f1b0b522beefb3117afb1f5c250e6..f5befd4945f2a84d4123ce47d2c68d5bab1a0a88 100644 (file)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -300,7 +300,6 @@ struct apic {
 
        unsigned int (*get_apic_id)(unsigned long x);
        unsigned long (*set_apic_id)(unsigned int id);
-       unsigned long apic_id_mask;
 
        int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask,
                                      const struct cpumask *andmask,