3 files changed, 4 insertions, 5 deletions

diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c
index 45a8685bb60b..0b29d41322a2 100644
--- a/arch/i386/kernel/hpet.c
+++ b/arch/i386/kernel/hpet.c
@@ -12,7 +12,7 @@
 /* FSEC = 10^-15 NSEC = 10^-9 */
 #define FSEC_PER_NSEC   1000000
 
-static void *hpet_ptr;
+static void __iomem *hpet_ptr;
 
 static cycle_t read_hpet(void)
 {
@@ -40,8 +40,7 @@ static int __init init_hpet_clocksource(void)
                 return -ENODEV;
 
         /* calculate the hpet address: */
-        hpet_base =
-                (void __iomem*)ioremap_nocache(hpet_address, HPET_MMAP_SIZE);
+        hpet_base = ioremap_nocache(hpet_address, HPET_MMAP_SIZE);
         hpet_ptr = hpet_base + HPET_COUNTER;
 
         /* calculate the frequency: */
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 5592fa6e1fa1..ba8d302a0b72 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -126,7 +126,7 @@ static inline void io_apic_write(unsigned int apic, unsigned int reg, unsigned i
  */
 static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned int value)
 {
-        volatile struct io_apic *io_apic = io_apic_base(apic);
+        volatile struct io_apic __iomem *io_apic = io_apic_base(apic);
         if (sis_apic_bug)
                 writel(reg, &io_apic->index);
         writel(value, &io_apic->data);
diff --git a/arch/i386/mm/pageattr.c b/arch/i386/mm/pageattr.c
index ad91528bdc14..e223b1d4981c 100644
--- a/arch/i386/mm/pageattr.c
+++ b/arch/i386/mm/pageattr.c
@@ -224,7 +224,7 @@ void global_flush_tlb(void)
         list_replace_init(&df_list, &l);
         spin_unlock_irq(&cpa_lock);
         if (!cpu_has_clflush)
-                flush_map(0);
+                flush_map(NULL);
         list_for_each_entry_safe(pg, next, &l, lru) {
                 if (cpu_has_clflush)
                         flush_map(page_address(pg));