arm64: Fix shift warning in arch/arm64/mm/dump.c

ctmarinas · ctmarinas · commit a93a4d623241 · 2016-08-18T12:38:11.000+01:00
When building with 48-bit VAs and 16K page configuration, it's possible
to get the following warning when building the arm64 page table dumping
code:

arch/arm64/mm/dump.c: In function ‘walk_pud’:
arch/arm64/mm/dump.c:274:102: warning: right shift count &gt;= width of type [-Wshift-count-overflow]

This is because pud_offset(pgd, 0) performs a shift to the right by 36
while the value 0 has the type 'int' by default, therefore 32-bit.

This patch modifies all the p*_offset() uses in arch/arm64/mm/dump.c to
use 0UL for the address argument.

Acked-by: Mark Rutland &lt;mark.rutland@arm.com&gt;
Signed-off-by: Catalin Marinas &lt;catalin.marinas@arm.com&gt;
diff --git a/arch/arm64/mm/dump.c b/arch/arm64/mm/dump.c
@@ -242,7 +242,7 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned level,
 
 static void walk_pte(struct pg_state *st, pmd_t *pmd, unsigned long start)
 {
-	pte_t *pte = pte_offset_kernel(pmd, 0);
+	pte_t *pte = pte_offset_kernel(pmd, 0UL);
 	unsigned long addr;
 	unsigned i;
 
@@ -254,7 +254,7 @@ static void walk_pte(struct pg_state *st, pmd_t *pmd, unsigned long start)
 
 static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start)
 {
-	pmd_t *pmd = pmd_offset(pud, 0);
+	pmd_t *pmd = pmd_offset(pud, 0UL);
 	unsigned long addr;
 	unsigned i;
 
@@ -271,7 +271,7 @@ static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start)
 
 static void walk_pud(struct pg_state *st, pgd_t *pgd, unsigned long start)
 {
-	pud_t *pud = pud_offset(pgd, 0);
+	pud_t *pud = pud_offset(pgd, 0UL);
 	unsigned long addr;
 	unsigned i;
 

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned level,`
`242`	`242`
`243`	`243`	`static void walk_pte(struct pg_state st, pmd_t pmd, unsigned long start)`
`244`	`244`	`{`
`245`		`- pte_t *pte = pte_offset_kernel(pmd, 0);`
	`245`	`+ pte_t *pte = pte_offset_kernel(pmd, 0UL);`
`246`	`246`	`unsigned long addr;`
`247`	`247`	`unsigned i;`
`248`	`248`
`@@ -254,7 +254,7 @@ static void walk_pte(struct pg_state st, pmd_t pmd, unsigned long start)`
`254`	`254`
`255`	`255`	`static void walk_pmd(struct pg_state st, pud_t pud, unsigned long start)`
`256`	`256`	`{`
`257`		`- pmd_t *pmd = pmd_offset(pud, 0);`
	`257`	`+ pmd_t *pmd = pmd_offset(pud, 0UL);`
`258`	`258`	`unsigned long addr;`
`259`	`259`	`unsigned i;`
`260`	`260`
`@@ -271,7 +271,7 @@ static void walk_pmd(struct pg_state st, pud_t pud, unsigned long start)`
`271`	`271`
`272`	`272`	`static void walk_pud(struct pg_state st, pgd_t pgd, unsigned long start)`
`273`	`273`	`{`
`274`		`- pud_t *pud = pud_offset(pgd, 0);`
	`274`	`+ pud_t *pud = pud_offset(pgd, 0UL);`
`275`	`275`	`unsigned long addr;`
`276`	`276`	`unsigned i;`
`277`	`277`