Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf676945 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

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: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: Jeff Dike <jdike@addtoit.com>
LKML-Reference: <tip-69309a05@git.kernel.org>
parent 72c511dd

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

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
	set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))



#ifdef CONFIG_64BIT

#define set_pud(pudptr, pudval) set_64bit((phys_t *) (pudptr), pud_val(pudval))

#define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))

#else

#define set_pud(pudptr, pudval) (*(pudptr) = (pudval))

#endif
@@ -73,7 +73,7 @@ static inline int pgd_newpage(pgd_t pgd) 
static inline void pgd_mkuptodate(pgd_t pgd) { pgd_val(pgd) &= ~_PAGE_NEWPAGE; }



#ifdef CONFIG_64BIT

#define set_pmd(pmdptr, pmdval) set_64bit((phys_t *) (pmdptr), pmd_val(pmdval))

#define set_pmd(pmdptr, pmdval) set_64bit((u64 *) (pmdptr), pmd_val(pmdval))

#else

#define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval))

#endif