Skip to content

Commit

Permalink
x86: cpa: fix loop
Browse files Browse the repository at this point in the history 
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Ingo Molnar committed Jan 30, 2008
1 parent a72a08a commit 4692a14
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions arch/x86/mm/pageattr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ static int change_page_attr_addr(unsigned long address, pgprot_t prot)
static int change_page_attr_set(unsigned long addr, int numpages,
pgprot_t prot)
{
pgprot_t current_prot;
pgprot_t current_prot, new_prot;
int level;
pte_t *pte;
int i, ret;
Expand All @@ -317,9 +317,10 @@ static int change_page_attr_set(unsigned long addr, int numpages,
else
pgprot_val(current_prot) = 0;

pgprot_val(prot) = pgprot_val(current_prot) | pgprot_val(prot);
pgprot_val(new_prot) =
pgprot_val(current_prot) | pgprot_val(prot);

ret = change_page_attr_addr(addr, prot);
ret = change_page_attr_addr(addr, new_prot);
if (ret)
return ret;
addr += PAGE_SIZE;
Expand Down Expand Up @@ -349,7 +350,7 @@ static int change_page_attr_set(unsigned long addr, int numpages,
static int change_page_attr_clear(unsigned long addr, int numpages,
pgprot_t prot)
{
pgprot_t current_prot;
pgprot_t current_prot, new_prot;
int level;
pte_t *pte;
int i, ret;
Expand All @@ -361,10 +362,10 @@ static int change_page_attr_clear(unsigned long addr, int numpages,
else
pgprot_val(current_prot) = 0;

pgprot_val(prot) =
pgprot_val(new_prot) =
pgprot_val(current_prot) & ~pgprot_val(prot);

ret = change_page_attr_addr(addr, prot);
ret = change_page_attr_addr(addr, new_prot);
if (ret)
return ret;
addr += PAGE_SIZE;
Expand Down

0 comments on commit 4692a14

Please sign in to comment.