x86: fixes for lookup_address args
PATCH 1/1 x86: fixes for lookup_address args
Signedness mismatches in level argument.
Signed-off-by Harvey Harrison <[email protected]>
---
Ingo, my other patch changing lookup_address was truncated and missed the other call sites, here's the rest. You can either fold this into that patch or apply separately.
arch/x86/kernel/efi_64.c | 2 +- arch/x86/mm/fault.c | 2 +- arch/x86/mm/ioremap.c | 3 ++- arch/x86/mm/pageattr-test.c | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-)
arch/x86/kernel/efi_64.c +1 -1
@@ -44,7 +44,7 @@ static void __init early_mapping_set_exec(unsigned long start, int executable) {pte_t *kpte; -int level; +unsigned int level;while (start < end) { kpte =lookup_address ((unsigned long )__va (start), &level);
arch/x86/mm/fault.c +1 -1
@@ -382,7 +382,7 @@ static void show_fault_oops(struct pt_regs *regs, unsigned long error_code,#ifdef CONFIG_X86_PAE if (error_code &PF_INSTR ) { -int level; +unsigned int level;pte_t *pte =lookup_address (address, &level);if (pte &&pte_present (*pte) && !pte_exec (*pte))
arch/x86/mm/ioremap.c +2 -1
@@ -75,7 +75,8 @@ static int ioremap_change_attr(unsigned long paddr, unsigned long size, {unsigned long vaddr = (unsigned long )__va (paddr);unsigned long nrpages = size >>PAGE_SHIFT ; -int err, level; +unsigned int level; +int err;/* No change for pages after the last mapping */ if ((paddr + size -1 ) >= (max_pfn_mapped <<PAGE_SHIFT ))
arch/x86/mm/pageattr-test.c +2 -2
@@ -42,7 +42,7 @@ static __init int print_split(struct split_state *s) s->max_exec =0 ;for (i =0 ; i < max_pfn_mapped; ) {unsigned long addr = (unsigned long )__va (i <<PAGE_SHIFT ); -int level; +unsigned int level;pte_t *pte; pte =lookup_address (addr, &level);
@@ -106,7 +106,7 @@ static __init int exercise_pageattr(void)unsigned long *bm;pte_t *pte, pte0;int failed =0 ; -int level; +unsigned int level;int i, k;int err;
Signature · 1 line
1.5.4.rc4.1142.gf5a97