vserver 2.0 rc7

[linux-2.6.git] / arch / arm / mach-sa1100 / assabet.c

diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index a3003b8..bedf88f 100644 (file)
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -259,9 +259,11 @@ static void __init map_sa1100_gpio_regs( void )
        unsigned long phys = __PREG(GPLR) & PMD_MASK;
        unsigned long virt = io_p2v(phys);
        int prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_DOMAIN(DOMAIN_IO);
-       pmd_t pmd;
-       pmd_val(pmd) = phys | prot;
-       set_pmd(pmd_offset(pgd_offset_k(virt), virt), pmd);
+       pmd_t *pmd;
+
+       pmd = pmd_offset(pgd_offset_k(virt), virt);
+       *pmd = __pmd(phys | prot);
+       flush_pmd_entry(pmd);
 }
 
 /*