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

Commit da7bfc50 authored by Harvey Harrison's avatar Harvey Harrison Committed by Thomas Gleixner
Browse files

x86: sparse warnings in pageattr.c 



Adjust the definition of lookup_address to take an unsigned long
level argument.  Adjust callers in xen/mmu.c that pass in a
dummy variable.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7c36752a

arch/x86/mm/pageattr.c

+5 −3
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address) 
 * or when the present bit is not set. Otherwise we would return a

 * pointer to a nonexisting mapping.

 */

pte_t *lookup_address(unsigned long address, int *level)

pte_t *lookup_address(unsigned long address, unsigned int *level)

{

	pgd_t *pgd = pgd_offset_k(address);

	pud_t *pud;
@@ -255,7 +255,8 @@ try_preserve_large_page(pte_t *kpte, unsigned long address, 
	unsigned long nextpage_addr, numpages, pmask, psize, flags;

	pte_t new_pte, old_pte, *tmp;

	pgprot_t old_prot, new_prot;

	int level, do_split = 1;

	int do_split = 1;

	unsigned int level;



	spin_lock_irqsave(&pgd_lock, flags);

	/*
@@ -406,7 +407,8 @@ static int split_large_page(pte_t *kpte, unsigned long address) 


static int __change_page_attr(unsigned long address, struct cpa_data *cpa)

{

	int level, do_split, err;

	int do_split, err;

	unsigned int level;

	struct page *kpte_page;

	pte_t *kpte;

arch/x86/xen/mmu.c

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 


xmaddr_t arbitrary_virt_to_machine(unsigned long address)

{

	int level;

	unsigned int level;

	pte_t *pte = lookup_address(address, &level);

	unsigned offset = address & PAGE_MASK;
@@ -71,7 +71,7 @@ void make_lowmem_page_readonly(void *vaddr) 
{

	pte_t *pte, ptev;

	unsigned long address = (unsigned long)vaddr;

	int level;

	unsigned int level;



	pte = lookup_address(address, &level);

	BUG_ON(pte == NULL);
@@ -86,7 +86,7 @@ void make_lowmem_page_readwrite(void *vaddr) 
{

	pte_t *pte, ptev;

	unsigned long address = (unsigned long)vaddr;

	int level;

	unsigned int level;



	pte = lookup_address(address, &level);

	BUG_ON(pte == NULL);

include/asm-x86/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ enum { 
 * NOTE: the return type is pte_t but if the pmd is PSE then we return it

 * as a pte too.

 */

extern pte_t *lookup_address(unsigned long address, int *level);

extern pte_t *lookup_address(unsigned long address, unsigned int *level);



/* local pte updates need not use xchg for locking */

static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep)