FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-18 06:50:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86: sparse warnings in pageattr.c

Browse Source 
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: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Harvey Harrison 2008-02-09 23:24:08 +01:00 committed by Thomas Gleixner
parent 7c36752a6b
commit da7bfc50f5
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/mm/pageattr.c
View File

@ -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 * or when the present bit is not set. Otherwise we would return a
* pointer to a nonexisting mapping. * 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); pgd_t *pgd = pgd_offset_k(address);
pud_t *pud; 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; unsigned long nextpage_addr, numpages, pmask, psize, flags;
pte_t new_pte, old_pte, *tmp; pte_t new_pte, old_pte, *tmp;
pgprot_t old_prot, new_prot; pgprot_t old_prot, new_prot;
int level, do_split = 1; int do_split = 1;
unsigned int level;
spin_lock_irqsave(&pgd_lock, flags); spin_lock_irqsave(&pgd_lock, flags);
/* /*
@ -406,7 +407,8 @@ out_unlock:
static int __change_page_attr(unsigned long address, struct cpa_data *cpa) 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; struct page *kpte_page;
pte_t *kpte; pte_t *kpte;

6
arch/x86/xen/mmu.c
View File

@ -58,7 +58,7 @@
xmaddr_t arbitrary_virt_to_machine(unsigned long address) xmaddr_t arbitrary_virt_to_machine(unsigned long address)
{ {
int level; unsigned int level;
pte_t *pte = lookup_address(address, &level); pte_t *pte = lookup_address(address, &level);
unsigned offset = address & PAGE_MASK; unsigned offset = address & PAGE_MASK;
@ -71,7 +71,7 @@ void make_lowmem_page_readonly(void *vaddr)
{ {
pte_t *pte, ptev; pte_t *pte, ptev;
unsigned long address = (unsigned long)vaddr; unsigned long address = (unsigned long)vaddr;
int level; unsigned int level;
pte = lookup_address(address, &level); pte = lookup_address(address, &level);
BUG_ON(pte == NULL); BUG_ON(pte == NULL);
@ -86,7 +86,7 @@ void make_lowmem_page_readwrite(void *vaddr)
{ {
pte_t *pte, ptev; pte_t *pte, ptev;
unsigned long address = (unsigned long)vaddr; unsigned long address = (unsigned long)vaddr;
int level; unsigned int level;
pte = lookup_address(address, &level); pte = lookup_address(address, &level);
BUG_ON(pte == NULL); BUG_ON(pte == NULL);

2
include/asm-x86/pgtable.h
View File

@ -255,7 +255,7 @@ enum {
* NOTE: the return type is pte_t but if the pmd is PSE then we return it * NOTE: the return type is pte_t but if the pmd is PSE then we return it
* as a pte too. * 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 */ /* local pte updates need not use xchg for locking */
static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep) static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep)