Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a61c2332f8e1939cd4984b63cab641b2366eb428

Authored by Russell King
1 parent 716a3dc200
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ARM: sa11x0: assabet: fix build warning 

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

arch/arm/mach-sa1100/assabet.c
Diff comments   View file @ a61c233
... ... @@ -268,7 +268,7 @@
268 268 int prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_DOMAIN(DOMAIN_IO);
269 269 pmd_t *pmd;
270 270  
271   - pmd = pmd_offset(pgd_offset_k(virt), virt);
  271 + pmd = pmd_offset(pud_offset(pgd_offset_k(virt), virt), virt);
272 272 *pmd = __pmd(phys | prot);
273 273 flush_pmd_entry(pmd);
274 274 }