]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ARM: sa11x0: assabet: fix build warning
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 14 Jan 2012 16:10:53 +0000 (16:10 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 16 Jan 2012 22:25:29 +0000 (22:25 +0000)
Since a32618d2 (ARM: pgtable: switch to use pgtable-nopud.h), assabet
warns as follows:

arch/arm/mach-sa1100/assabet.c: In function 'map_sa1100_gpio_regs':
arch/arm/mach-sa1100/assabet.c:264: warning: passing argument 1 of 'pmd_offset' from incompatible pointer type

Fix this by adding the necessary pud_offset() macro.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-sa1100/assabet.c

index 6b93e200bcaceecec1bdc18c27929480b860066b..0c4b76ab4d8eba0037e305d5d8f9b17b36074fa7 100644 (file)
@@ -268,7 +268,7 @@ static void __init map_sa1100_gpio_regs( void )
        int prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_DOMAIN(DOMAIN_IO);
        pmd_t *pmd;
 
-       pmd = pmd_offset(pgd_offset_k(virt), virt);
+       pmd = pmd_offset(pud_offset(pgd_offset_k(virt), virt), virt);
        *pmd = __pmd(phys | prot);
        flush_pmd_entry(pmd);
 }