1 files changed, 20 insertions, 0 deletions

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index a0c46f061210..80b243c7f0f0 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -381,6 +381,26 @@ struct apic {
 extern struct apic *apic;
 
 /*
+ * APIC drivers are probed based on how they are listed in the .apicdrivers
+ * section. So the order is important and enforced by the ordering
+ * of different apic driver files in the Makefile.
+ *
+ * For the files having two apic drivers, we use apic_drivers()
+ * to enforce the order with in them.
+ */
+#define apic_driver(sym)                                        \
+        static struct apic *__apicdrivers_##sym __used          \
+        __aligned(sizeof(struct apic *))                        \
+        __section(.apicdrivers) = { &sym }
+
+#define apic_drivers(sym1, sym2)                                        \
+        static struct apic *__apicdrivers_##sym1##sym2[2] __used        \
+        __aligned(sizeof(struct apic *))                                \
+        __section(.apicdrivers) = { &sym1, &sym2 }
+
+extern struct apic *__apicdrivers[], *__apicdrivers_end[];
+
+/*
  * APIC functionality to boot other CPUs - only used on SMP:
  */
 #ifdef CONFIG_SMP