diff options
Diffstat (limited to 'arch/x86/mm/pageattr.c')
| -rw-r--r-- | arch/x86/mm/pageattr.c | 8 | 
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 8493c855582b..eb2a54415a77 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c  | |||
| @@ -191,7 +191,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address) | |||
| 191 | * or when the present bit is not set. Otherwise we would return a | 191 | * or when the present bit is not set. Otherwise we would return a | 
| 192 | * pointer to a nonexisting mapping. | 192 | * pointer to a nonexisting mapping. | 
| 193 | */ | 193 | */ | 
| 194 | pte_t *lookup_address(unsigned long address, int *level) | 194 | pte_t *lookup_address(unsigned long address, unsigned int *level) | 
| 195 | { | 195 | { | 
| 196 | pgd_t *pgd = pgd_offset_k(address); | 196 | pgd_t *pgd = pgd_offset_k(address); | 
| 197 | pud_t *pud; | 197 | pud_t *pud; | 
| @@ -255,7 +255,8 @@ try_preserve_large_page(pte_t *kpte, unsigned long address, | |||
| 255 | unsigned long nextpage_addr, numpages, pmask, psize, flags; | 255 | unsigned long nextpage_addr, numpages, pmask, psize, flags; | 
| 256 | pte_t new_pte, old_pte, *tmp; | 256 | pte_t new_pte, old_pte, *tmp; | 
| 257 | pgprot_t old_prot, new_prot; | 257 | pgprot_t old_prot, new_prot; | 
| 258 | int level, do_split = 1; | 258 | int do_split = 1; | 
| 259 | unsigned int level; | ||
| 259 | 260 | ||
| 260 | spin_lock_irqsave(&pgd_lock, flags); | 261 | spin_lock_irqsave(&pgd_lock, flags); | 
| 261 | /* | 262 | /* | 
| @@ -406,7 +407,8 @@ out_unlock: | |||
| 406 | 407 | ||
| 407 | static int __change_page_attr(unsigned long address, struct cpa_data *cpa) | 408 | static int __change_page_attr(unsigned long address, struct cpa_data *cpa) | 
| 408 | { | 409 | { | 
| 409 | int level, do_split, err; | 410 | int do_split, err; | 
| 411 | unsigned int level; | ||
| 410 | struct page *kpte_page; | 412 | struct page *kpte_page; | 
| 411 | pte_t *kpte; | 413 | pte_t *kpte; | 
| 412 | 414 | ||
