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>
This commit is contained in:
committed by
Ingo Molnar
parent
4a1485131a
commit
93809be8b1
@@ -44,7 +44,7 @@ static void __init early_mapping_set_exec(unsigned long start,
|
|||||||
int executable)
|
int executable)
|
||||||
{
|
{
|
||||||
pte_t *kpte;
|
pte_t *kpte;
|
||||||
int level;
|
unsigned int level;
|
||||||
|
|
||||||
while (start < end) {
|
while (start < end) {
|
||||||
kpte = lookup_address((unsigned long)__va(start), &level);
|
kpte = lookup_address((unsigned long)__va(start), &level);
|
||||||
|
@@ -382,7 +382,7 @@ static void show_fault_oops(struct pt_regs *regs, unsigned long error_code,
|
|||||||
|
|
||||||
#ifdef CONFIG_X86_PAE
|
#ifdef CONFIG_X86_PAE
|
||||||
if (error_code & PF_INSTR) {
|
if (error_code & PF_INSTR) {
|
||||||
int level;
|
unsigned int level;
|
||||||
pte_t *pte = lookup_address(address, &level);
|
pte_t *pte = lookup_address(address, &level);
|
||||||
|
|
||||||
if (pte && pte_present(*pte) && !pte_exec(*pte))
|
if (pte && pte_present(*pte) && !pte_exec(*pte))
|
||||||
|
@@ -75,7 +75,8 @@ static int ioremap_change_attr(unsigned long paddr, unsigned long size,
|
|||||||
{
|
{
|
||||||
unsigned long vaddr = (unsigned long)__va(paddr);
|
unsigned long vaddr = (unsigned long)__va(paddr);
|
||||||
unsigned long nrpages = size >> PAGE_SHIFT;
|
unsigned long nrpages = size >> PAGE_SHIFT;
|
||||||
int err, level;
|
unsigned int level;
|
||||||
|
int err;
|
||||||
|
|
||||||
/* No change for pages after the last mapping */
|
/* No change for pages after the last mapping */
|
||||||
if ((paddr + size - 1) >= (max_pfn_mapped << PAGE_SHIFT))
|
if ((paddr + size - 1) >= (max_pfn_mapped << PAGE_SHIFT))
|
||||||
|
@@ -42,7 +42,7 @@ static __init int print_split(struct split_state *s)
|
|||||||
s->max_exec = 0;
|
s->max_exec = 0;
|
||||||
for (i = 0; i < max_pfn_mapped; ) {
|
for (i = 0; i < max_pfn_mapped; ) {
|
||||||
unsigned long addr = (unsigned long)__va(i << PAGE_SHIFT);
|
unsigned long addr = (unsigned long)__va(i << PAGE_SHIFT);
|
||||||
int level;
|
unsigned int level;
|
||||||
pte_t *pte;
|
pte_t *pte;
|
||||||
|
|
||||||
pte = lookup_address(addr, &level);
|
pte = lookup_address(addr, &level);
|
||||||
@@ -106,7 +106,7 @@ static __init int exercise_pageattr(void)
|
|||||||
unsigned long *bm;
|
unsigned long *bm;
|
||||||
pte_t *pte, pte0;
|
pte_t *pte, pte0;
|
||||||
int failed = 0;
|
int failed = 0;
|
||||||
int level;
|
unsigned int level;
|
||||||
int i, k;
|
int i, k;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user