Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4692a1450b4d1000a942022b088c8791749dd65e Commit: 4692a1450b4d1000a942022b088c8791749dd65e Parent: a72a08a4b61cb8868606a69b744848552e92062b Author: Ingo Molnar <[EMAIL PROTECTED]> AuthorDate: Wed Jan 30 13:34:07 2008 +0100 Committer: Ingo Molnar <[EMAIL PROTECTED]> CommitDate: Wed Jan 30 13:34:07 2008 +0100
x86: cpa: fix loop Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]> Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]> --- arch/x86/mm/pageattr.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index a2ee317..5cfc0d4 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -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; @@ -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; @@ -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; @@ -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; - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html