1 files changed, 71 insertions, 8 deletions
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c
index 1cc302d16fb4..d30854b18d25 100644
--- a/arch/x86/kernel/irqinit.c
+++ b/arch/x86/kernel/irqinit.c
@@ -166,14 +166,77 @@ static void __init smp_intr_init(void)
        alloc_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt);
        /* IPIs for invalidation */
-        alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+0, invalidate_interrupt0);
+#define ALLOC_INVTLB_VEC(NR) \
-        alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+1, invalidate_interrupt1);
+        alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+NR, \
-        alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+2, invalidate_interrupt2);
+                invalidate_interrupt##NR)
-        alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+3, invalidate_interrupt3);
-        alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+4, invalidate_interrupt4);
+        switch (NUM_INVALIDATE_TLB_VECTORS) {
-        alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+5, invalidate_interrupt5);
+        default:
-        alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+6, invalidate_interrupt6);
+                ALLOC_INVTLB_VEC(31);
-        alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+7, invalidate_interrupt7);
+        case 31:
+                ALLOC_INVTLB_VEC(30);
+        case 30:
+                ALLOC_INVTLB_VEC(29);
+        case 29:
+                ALLOC_INVTLB_VEC(28);
+        case 28:
+                ALLOC_INVTLB_VEC(27);
+        case 27:
+                ALLOC_INVTLB_VEC(26);
+        case 26:
+                ALLOC_INVTLB_VEC(25);
+        case 25:
+                ALLOC_INVTLB_VEC(24);
+        case 24:
+                ALLOC_INVTLB_VEC(23);
+        case 23:
+                ALLOC_INVTLB_VEC(22);
+        case 22:
+                ALLOC_INVTLB_VEC(21);
+        case 21:
+                ALLOC_INVTLB_VEC(20);
+        case 20:
+                ALLOC_INVTLB_VEC(19);
+        case 19:
+                ALLOC_INVTLB_VEC(18);
+        case 18:
+                ALLOC_INVTLB_VEC(17);
+        case 17:
+                ALLOC_INVTLB_VEC(16);
+        case 16:
+                ALLOC_INVTLB_VEC(15);
+        case 15:
+                ALLOC_INVTLB_VEC(14);
+        case 14:
+                ALLOC_INVTLB_VEC(13);
+        case 13:
+                ALLOC_INVTLB_VEC(12);
+        case 12:
+                ALLOC_INVTLB_VEC(11);
+        case 11:
+                ALLOC_INVTLB_VEC(10);
+        case 10:
+                ALLOC_INVTLB_VEC(9);
+        case 9:
+                ALLOC_INVTLB_VEC(8);
+        case 8:
+                ALLOC_INVTLB_VEC(7);
+        case 7:
+                ALLOC_INVTLB_VEC(6);
+        case 6:
+                ALLOC_INVTLB_VEC(5);
+        case 5:
+                ALLOC_INVTLB_VEC(4);
+        case 4:
+                ALLOC_INVTLB_VEC(3);
+        case 3:
+                ALLOC_INVTLB_VEC(2);
+        case 2:
+                ALLOC_INVTLB_VEC(1);
+        case 1:
+                ALLOC_INVTLB_VEC(0);
+                break;
+        }
        /* IPI for generic function call */
        alloc_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);

diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index 1cc302d16fb4..d30854b18d25 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c
@@ -166,14 +166,77 @@ static void __init smp_intr_init(void)
166	alloc_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt);	166	alloc_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt);
167		167
168	/* IPIs for invalidation */	168	/* IPIs for invalidation */
169	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+0, invalidate_interrupt0);	169	#define ALLOC_INVTLB_VEC(NR) \
170	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+1, invalidate_interrupt1);	170	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+NR, \
171	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+2, invalidate_interrupt2);	171	invalidate_interrupt##NR)
172	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+3, invalidate_interrupt3);	172
173	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+4, invalidate_interrupt4);	173	switch (NUM_INVALIDATE_TLB_VECTORS) {
174	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+5, invalidate_interrupt5);	174	default:
175	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+6, invalidate_interrupt6);	175	ALLOC_INVTLB_VEC(31);
176	alloc_intr_gate(INVALIDATE_TLB_VECTOR_START+7, invalidate_interrupt7);	176	case 31:
		177	ALLOC_INVTLB_VEC(30);
		178	case 30:
		179	ALLOC_INVTLB_VEC(29);
		180	case 29:
		181	ALLOC_INVTLB_VEC(28);
		182	case 28:
		183	ALLOC_INVTLB_VEC(27);
		184	case 27:
		185	ALLOC_INVTLB_VEC(26);
		186	case 26:
		187	ALLOC_INVTLB_VEC(25);
		188	case 25:
		189	ALLOC_INVTLB_VEC(24);
		190	case 24:
		191	ALLOC_INVTLB_VEC(23);
		192	case 23:
		193	ALLOC_INVTLB_VEC(22);
		194	case 22:
		195	ALLOC_INVTLB_VEC(21);
		196	case 21:
		197	ALLOC_INVTLB_VEC(20);
		198	case 20:
		199	ALLOC_INVTLB_VEC(19);
		200	case 19:
		201	ALLOC_INVTLB_VEC(18);
		202	case 18:
		203	ALLOC_INVTLB_VEC(17);
		204	case 17:
		205	ALLOC_INVTLB_VEC(16);
		206	case 16:
		207	ALLOC_INVTLB_VEC(15);
		208	case 15:
		209	ALLOC_INVTLB_VEC(14);
		210	case 14:
		211	ALLOC_INVTLB_VEC(13);
		212	case 13:
		213	ALLOC_INVTLB_VEC(12);
		214	case 12:
		215	ALLOC_INVTLB_VEC(11);
		216	case 11:
		217	ALLOC_INVTLB_VEC(10);
		218	case 10:
		219	ALLOC_INVTLB_VEC(9);
		220	case 9:
		221	ALLOC_INVTLB_VEC(8);
		222	case 8:
		223	ALLOC_INVTLB_VEC(7);
		224	case 7:
		225	ALLOC_INVTLB_VEC(6);
		226	case 6:
		227	ALLOC_INVTLB_VEC(5);
		228	case 5:
		229	ALLOC_INVTLB_VEC(4);
		230	case 4:
		231	ALLOC_INVTLB_VEC(3);
		232	case 3:
		233	ALLOC_INVTLB_VEC(2);
		234	case 2:
		235	ALLOC_INVTLB_VEC(1);
		236	case 1:
		237	ALLOC_INVTLB_VEC(0);
		238	break;
		239	}
177		240
178	/* IPI for generic function call */	241	/* IPI for generic function call */
179	alloc_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);	242	alloc_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);