x86, apic: unify the APIC vector enumeration

Most of the vector layout on 32-bit and 64-bit is identical now,
so eliminate the duplicated enumeration of the vectors.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h
index 0e2220b..393f85e 100644 (file)
--- a/arch/x86/include/asm/irq_vectors.h
+++ b/arch/x86/include/asm/irq_vectors.h
@@ -50,37 +50,26 @@
  *  into a single vector (CALL_FUNCTION_VECTOR) to save vector space.
  *  TLB, reschedule and local APIC vectors are performance-critical.
  */
-#ifdef CONFIG_X86_32
-
-# define SPURIOUS_APIC_VECTOR          0xff
-# define ERROR_APIC_VECTOR             0xfe
-# define RESCHEDULE_VECTOR             0xfd
-# define CALL_FUNCTION_VECTOR          0xfc
-# define CALL_FUNCTION_SINGLE_VECTOR   0xfb
-# define THERMAL_APIC_VECTOR           0xfa
-/* 0xf8 - 0xf9 : free */
-# define INVALIDATE_TLB_VECTOR_END     0xf7
-# define INVALIDATE_TLB_VECTOR_START   0xf0    /* f0-f7 used for TLB flush */
 
-# define NUM_INVALIDATE_TLB_VECTORS    8
+#define SPURIOUS_APIC_VECTOR           0xff
+#define ERROR_APIC_VECTOR              0xfe
+#define RESCHEDULE_VECTOR              0xfd
+#define CALL_FUNCTION_VECTOR           0xfc
+#define CALL_FUNCTION_SINGLE_VECTOR    0xfb
+#define THERMAL_APIC_VECTOR            0xfa
 
+#ifdef CONFIG_X86_32
+/* 0xf8 - 0xf9 : free */
 #else
-
-# define SPURIOUS_APIC_VECTOR          0xff
-# define ERROR_APIC_VECTOR             0xfe
-# define RESCHEDULE_VECTOR             0xfd
-# define CALL_FUNCTION_VECTOR          0xfc
-# define CALL_FUNCTION_SINGLE_VECTOR   0xfb
-# define THERMAL_APIC_VECTOR           0xfa
 # define THRESHOLD_APIC_VECTOR         0xf9
 # define UV_BAU_MESSAGE                        0xf8
-# define INVALIDATE_TLB_VECTOR_END     0xf7
-# define INVALIDATE_TLB_VECTOR_START   0xf0    /* f0-f7 used for TLB flush */
+#endif
 
+/* f0-f7 used for spreading out TLB flushes: */
+#define INVALIDATE_TLB_VECTOR_END      0xf7
+#define INVALIDATE_TLB_VECTOR_START    0xf0
 #define NUM_INVALIDATE_TLB_VECTORS     8
 
-#endif
-
 /*
  * Local APIC timer IRQ vector is on a different priority level,
  * to work around the 'lost local interrupt if more than 2 IRQ