Skip to content

Commit 8518e69

Browse files
geertuRich Felker
authored andcommitted
sh: pgtable-3level: Fix cast to pointer from integer of different size
If X2TLB=y (CPU_SHX2=y or CPU_SHX3=y, e.g. migor_defconfig), pgd_t.pgd is "unsigned long long", causing: In file included from arch/sh/include/asm/pgtable.h:13, from include/linux/pgtable.h:6, from include/linux/mm.h:33, from arch/sh/kernel/asm-offsets.c:14: arch/sh/include/asm/pgtable-3level.h: In function ‘pud_pgtable’: arch/sh/include/asm/pgtable-3level.h:37:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 37 | return (pmd_t *)pud_val(pud); | ^ Fix this by adding an intermediate cast to "unsigned long", which is basically what the old code did before. Fixes: 9cf6fa2 ("mm: rename pud_page_vaddr to pud_pgtable and make it return pmd_t *") Signed-off-by: Geert Uytterhoeven <[email protected]> Tested-by: Daniel Palmer <[email protected]> Acked-by: Rob Landley <[email protected]> Tested-by: John Paul Adrian Glaubitz <[email protected]> Signed-off-by: Rich Felker <[email protected]>
1 parent 475c3f5 commit 8518e69

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/sh/include/asm/pgtable-3level.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ typedef struct { unsigned long long pmd; } pmd_t;
3434

3535
static inline pmd_t *pud_pgtable(pud_t pud)
3636
{
37-
return (pmd_t *)pud_val(pud);
37+
return (pmd_t *)(unsigned long)pud_val(pud);
3838
}
3939

4040
/* only used by the stubbed out hugetlb gup code, should never be called */

0 commit comments

Comments
 (0)