Skip to contentSkip to conversation

x86: order variables in io_apic_xx.c

PATCH Applied Yinghai Lu 2 participants 2 messages Aug 15, 2008 x86

lore
Share & tools
lore

Yinghai Lu

author
#0 lore raw

PATCH 1/1 x86: order variables in io_apic_xx.c

move first_system_vector to apic_64.c
also add #ifdef CONFIG_INTR_REMAP to prepare 32 bit to use same file

---
 arch/x86/kernel/apic_64.c    |    5 +
 arch/x86/kernel/io_apic_32.c |   79 +++++++++------------
 arch/x86/kernel/io_apic_64.c |  160 ++++++++++++++++++++++---------------------
 3 files changed, 127 insertions(+), 117 deletions(-)
arch/x86/kernel/apic_64.c +5 -0
Index: linux-2.6/arch/x86/kernel/apic_64.c
===================================================================
@@ -33,6 +33,7 @@
 #include <asm/smp.h>
 #include <asm/mtrr.h>
 #include <asm/mpspec.h>
+#include <asm/desc.h>
 #include <asm/hpet.h>
 #include <asm/pgalloc.h>
 #include <asm/nmi.h>
@@ -58,6 +59,10 @@ int x2apic_preenabled;
 int local_apic_timer_c2_ok;
 EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok);
 
+int first_system_vector = 0xfe;
+
+char system_vectors[NR_VECTORS] = { [0 ... NR_VECTORS-1] = SYS_VECTOR_FREE};
+
 /*
  * Debug level, exported for io_apic.c
  */
arch/x86/kernel/io_apic_32.c +37 -42

147 lines not on this page · raw message

arch/x86/kernel/io_apic_64.c +85 -75

268 lines not on this page · raw message

Applied
#1 lore raw
Quoted 3 lines · Yinghai Lu

move first_system_vector to apic_64.c
also add #ifdef CONFIG_INTR_REMAP to prepare 32 bit to use same file

applied to tip/irq/sparseirq - thanks.

Ingo