x86: fixes for lookup_address args

Signedness mismatches in level argument.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/efi_64.c b/arch/x86/kernel/efi_64.c
index 4b73992c1e111945012993742b436fda177f51b8..674f2379480f99123aafef01ac0d4e34e5e330ee 100644 (file)
--- a/arch/x86/kernel/efi_64.c
+++ b/arch/x86/kernel/efi_64.c
@@ -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);

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index e28cc5277b167c3907075b0f610342cd7a2ceec8..e4440d0abf817005e9fce4a2686ca452446e3fc0 100644 (file)
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -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))

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index a177d76e1c53c2c3d01a61cbc94ad86e43cda8c5..c004d94608fd4a21035684c12cf0b6af5d3d46ba 100644 (file)
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -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))

diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
index 06353d43f72e073cc01034502d426a37f90d015e..7573e786d2f202d98754f2a484220c75b1250c31 100644 (file)
--- a/arch/x86/mm/pageattr-test.c
+++ b/arch/x86/mm/pageattr-test.c
@@ -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;