aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-02-01 11:49:43 -0500
committerIngo Molnar <mingo@elte.hu>2008-02-01 11:49:43 -0500
commit93809be8b140c101d27f00d0a622ebac90bc7a67 (patch)
tree2b5effc7e8d77e6f26a271838968cf793207767b /arch/x86
parent4a1485131a6038ba5382f407db48badc332672c4 (diff)
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/efi_64.c2
-rw-r--r--arch/x86/mm/fault.c2
-rw-r--r--arch/x86/mm/ioremap.c3
-rw-r--r--arch/x86/mm/pageattr-test.c4
4 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/kernel/efi_64.c b/arch/x86/kernel/efi_64.c
index 4b73992c1e11..674f2379480f 100644
--- 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,
44 int executable) 44 int executable)
45{ 45{
46 pte_t *kpte; 46 pte_t *kpte;
47 int level; 47 unsigned int level;
48 48
49 while (start < end) { 49 while (start < end) {
50 kpte = lookup_address((unsigned long)__va(start), &level); 50 kpte = lookup_address((unsigned long)__va(start), &level);
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index e28cc5277b16..e4440d0abf81 100644
--- 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,
382 382
383#ifdef CONFIG_X86_PAE 383#ifdef CONFIG_X86_PAE
384 if (error_code & PF_INSTR) { 384 if (error_code & PF_INSTR) {
385 int level; 385 unsigned int level;
386 pte_t *pte = lookup_address(address, &level); 386 pte_t *pte = lookup_address(address, &level);
387 387
388 if (pte && pte_present(*pte) && !pte_exec(*pte)) 388 if (pte && pte_present(*pte) && !pte_exec(*pte))
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index a177d76e1c53..c004d94608fd 100644
--- 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,
75{ 75{
76 unsigned long vaddr = (unsigned long)__va(paddr); 76 unsigned long vaddr = (unsigned long)__va(paddr);
77 unsigned long nrpages = size >> PAGE_SHIFT; 77 unsigned long nrpages = size >> PAGE_SHIFT;
78 int err, level; 78 unsigned int level;
79 int err;
79 80
80 /* No change for pages after the last mapping */ 81 /* No change for pages after the last mapping */
81 if ((paddr + size - 1) >= (max_pfn_mapped << PAGE_SHIFT)) 82 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 06353d43f72e..7573e786d2f2 100644
--- 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)
42 s->max_exec = 0; 42 s->max_exec = 0;
43 for (i = 0; i < max_pfn_mapped; ) { 43 for (i = 0; i < max_pfn_mapped; ) {
44 unsigned long addr = (unsigned long)__va(i << PAGE_SHIFT); 44 unsigned long addr = (unsigned long)__va(i << PAGE_SHIFT);
45 int level; 45 unsigned int level;
46 pte_t *pte; 46 pte_t *pte;
47 47
48 pte = lookup_address(addr, &level); 48 pte = lookup_address(addr, &level);
@@ -106,7 +106,7 @@ static __init int exercise_pageattr(void)
106 unsigned long *bm; 106 unsigned long *bm;
107 pte_t *pte, pte0; 107 pte_t *pte, pte0;
108 int failed = 0; 108 int failed = 0;
109 int level; 109 unsigned int level;
110 int i, k; 110 int i, k;
111 int err; 111 int err;
112 112