[PATCH 2/2] x86: move pic_mode to apic_32.c

From: Alexey Starikovskiy
Date: Thu May 22 2008 - 17:54:41 EST


Signed-off-by: Alexey Starikovskiy <astarikovskiy@xxxxxxx>
---

arch/x86/kernel/apic_32.c | 2 ++
arch/x86/kernel/mpparse.c | 2 --
arch/x86/mach-visws/mpparse.c | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)


diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 6b2c2cf..c0dd696 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -77,6 +77,8 @@ char system_vectors[NR_VECTORS] = { [0 ... NR_VECTORS-1] = SYS_VECTOR_FREE};
*/
int apic_verbosity;

+int pic_mode;
+
static unsigned int calibration_result;

static int lapic_next_event(unsigned long delta,
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index e61523a..b72c046 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -48,8 +48,6 @@ int mp_bus_id_to_pci_bus[MAX_MP_BUSSES] = {[0 ... MAX_MP_BUSSES - 1] = -1 };

static int mp_current_pci_id;

-int pic_mode;
-
/*
* Intel MP BIOS table parsing routines:
*/
diff --git a/arch/x86/mach-visws/mpparse.c b/arch/x86/mach-visws/mpparse.c
index 57484e9..b7d063e 100644
--- a/arch/x86/mach-visws/mpparse.c
+++ b/arch/x86/mach-visws/mpparse.c
@@ -11,8 +11,6 @@
/* Have we found an MP table */
int smp_found_config;

-int pic_mode;
-
extern unsigned int __cpuinitdata maxcpus;

/*

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/