From: Suresh Siddha <suresh.b.siddha@intel.com>
Date: Thu, 29 Jan 2009 01:52:57 +0000 (-0800)
Subject: x86: remove mach_apic.h, fix
X-Git-Tag: v2.6.30-rc1~211^2~26^2~2^2~89
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=83d7aeabe4cf20e59b5d7fd56a75cfd0e0b6b880;p=net-next-2.6.git

x86: remove mach_apic.h, fix

Use apic_read() instead of open-coded mmio.

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

diff --git a/arch/x86/include/asm/genapic.h b/arch/x86/include/asm/genapic.h
index ce3655a4948..ccfcd19d5b7 100644
--- a/arch/x86/include/asm/genapic.h
+++ b/arch/x86/include/asm/genapic.h
@@ -145,7 +145,7 @@ static inline unsigned int read_apic_id(void)
 {
 	unsigned int reg;
 
-	reg = *(u32 *)(APIC_BASE + APIC_ID);
+	reg = apic_read(APIC_ID);
 
 	return apic->get_apic_id(reg);
 }