[tip:x86/apic] x86, ioapic: Define IO_APIC_DEFAULT_PHYS_BASE constant

From: tip-bot for Cyrill Gorcunov
Date: Wed Aug 26 2009 - 02:23:00 EST


Commit-ID: 8f3e1df48baf728bbb0f242c9dff9c9d7108218a
Gitweb: http://git.kernel.org/tip/8f3e1df48baf728bbb0f242c9dff9c9d7108218a
Author: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
AuthorDate: Mon, 24 Aug 2009 21:53:36 +0400
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 26 Aug 2009 08:16:38 +0200

x86, ioapic: Define IO_APIC_DEFAULT_PHYS_BASE constant

We already have APIC_DEFAULT_PHYS_BASE so just to be
consistent.

Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
LKML-Reference: <20090824175550.927946757@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
arch/x86/include/asm/apicdef.h | 3 ++-
arch/x86/kernel/mpparse.c | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h
index 7ddb36a..7386bfa 100644
--- a/arch/x86/include/asm/apicdef.h
+++ b/arch/x86/include/asm/apicdef.h
@@ -8,7 +8,8 @@
* Ingo Molnar <mingo@xxxxxxxxxx>, 1999, 2000
*/

-#define APIC_DEFAULT_PHYS_BASE 0xfee00000
+#define IO_APIC_DEFAULT_PHYS_BASE 0xfec00000
+#define APIC_DEFAULT_PHYS_BASE 0xfee00000

#define APIC_ID 0x20

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 651c93b..fcd513b 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -482,11 +482,11 @@ static void __init construct_ioapic_table(int mpc_default_type)
MP_bus_info(&bus);
}

- ioapic.type = MP_IOAPIC;
- ioapic.apicid = 2;
- ioapic.apicver = mpc_default_type > 4 ? 0x10 : 0x01;
- ioapic.flags = MPC_APIC_USABLE;
- ioapic.apicaddr = 0xFEC00000;
+ ioapic.type = MP_IOAPIC;
+ ioapic.apicid = 2;
+ ioapic.apicver = mpc_default_type > 4 ? 0x10 : 0x01;
+ ioapic.flags = MPC_APIC_USABLE;
+ ioapic.apicaddr = IO_APIC_DEFAULT_PHYS_BASE;
MP_ioapic_info(&ioapic);

/*
--
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/