Commit bf676945cb5bfe455321f57968967c18976f4995

Authored by H. Peter Anvin
1 parent 72c511dd59

um, x86: Cast to (u64 *) inside set_64bit()

After tightening up the types passed to set_64bit(), the cast to
(phys_t *) triggers a warning apparently because phys_t is defined as
"unsigned long" when building on 64 bits; however, u64 is defined as
"unsigned long long".  This is, however, a explicit cast inside a
size-specific call, so just make the cast explicitly (u64 *).

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Jeff Dike <jdike@addtoit.com>
LKML-Reference: <tip-69309a05907546fb686b251d4ab041c26afe1e1d@git.kernel.org>

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

arch/um/include/asm/pgtable-3level.h
... ... @@ -60,7 +60,7 @@
60 60 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
61 61  
62 62 #ifdef CONFIG_64BIT
63   -#define set_pud(pudptr, pudval) set_64bit((phys_t *) (pudptr), pud_val(pudval))
  63 +#define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
64 64 #else
65 65 #define set_pud(pudptr, pudval) (*(pudptr) = (pudval))
66 66 #endif
... ... @@ -73,7 +73,7 @@
73 73 static inline void pgd_mkuptodate(pgd_t pgd) { pgd_val(pgd) &= ~_PAGE_NEWPAGE; }
74 74  
75 75 #ifdef CONFIG_64BIT
76   -#define set_pmd(pmdptr, pmdval) set_64bit((phys_t *) (pmdptr), pmd_val(pmdval))
  76 +#define set_pmd(pmdptr, pmdval) set_64bit((u64 *) (pmdptr), pmd_val(pmdval))
77 77 #else
78 78 #define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval))
79 79 #endif