x86: order variables in io_apic_xx.c

Previous thread: x86: ordering functions in io_apic_64.c by Linux Kernel Mailing List on Monday, October 20, 2008 - 3:11 pm. (1 message)

Next thread: sparseirq: fix lockdep by Linux Kernel Mailing List on Monday, October 20, 2008 - 3:11 pm. (1 message)
From: Linux Kernel Mailing List
Date: Monday, October 20, 2008 - 3:11 pm

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=efa255...
Commit:     efa2559f65167989f1893cb065e3126d4f13ba60
Parent:     8ea5371baa82db452a8d93e9977b418d30944e32
Author:     Yinghai Lu <yhlu.kernel@gmail.com>
AuthorDate: Tue Aug 19 20:50:36 2008 -0700
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Thu Oct 16 16:52:54 2008 +0200

    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.
    
    Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 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(-)

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 94ddb69..4d7a188 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/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>
@@ -59,6 +60,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
  */
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
index 9531ef3..3010bdd 100644
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@ -54,25 +54,23 @@
 
 #define __apicdebuginit(type) static type __init
 
-int (*ioapic_renumber_irq)(int ioapic, int irq);
-atomic_t irq_mis_count;
-
-/* Where if anywhere is the i8259 connect in external int mode */
-static struct { int pin, apic; } ...
Previous thread: x86: ordering functions in io_apic_64.c by Linux Kernel Mailing List on Monday, October 20, 2008 - 3:11 pm. (1 message)

Next thread: sparseirq: fix lockdep by Linux Kernel Mailing List on Monday, October 20, 2008 - 3:11 pm. (1 message)