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 ce3655a4948d5b7487621ac354686b497a11f5ea..ccfcd19d5b7d4c5e1174dc836b879807356e9a6e 100644 (file)
--- 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);
 }