Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=40842bf50e0719bcfe817fec2fe8b0b98dcdb244
Commit:     40842bf50e0719bcfe817fec2fe8b0b98dcdb244
Parent:     1c6f70309900c47eeaef12c97b206fcccde1ebe2
Author:     Joerg Roedel <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:31:02 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:31:02 2008 +0100

    x86: use __PAGE_KERNEL* instead of _KERNPG_TABLE
    
    This minor cleanup replaces _KERNPG_TABLE with the __PAGE_KERNEL* for 2MB 
PTEs
    in the 64-bit memory initialization code. The __PAGE_KERNEL* defines are 
more
    appropriate for PTEs.
    
    Signed-off-by: Joerg Roedel <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
 arch/x86/mm/init_64.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 251eeb3..3f8bf29 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -226,7 +226,7 @@ __meminit void *early_ioremap(unsigned long addr, unsigned 
long size)
                vaddr += addr & ~PMD_MASK;
                addr &= PMD_MASK;
                for (i = 0; i < pmds; i++, addr += PMD_SIZE)
-                       set_pmd(pmd + i,__pmd(addr | _KERNPG_TABLE | 
_PAGE_PSE));
+                       set_pmd(pmd + i,__pmd(addr | __PAGE_KERNEL_LARGE_EXEC));
                __flush_tlb();
                return (void *)vaddr;
        next:
@@ -270,7 +270,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, 
unsigned long end)
                if (pmd_val(*pmd))
                        continue;
 
-               entry = _PAGE_NX|_PAGE_PSE|_KERNPG_TABLE|_PAGE_GLOBAL|address;
+               entry = __PAGE_KERNEL_LARGE|_PAGE_GLOBAL|address;
                entry &= __supported_pte_mask;
                set_pmd(pmd, __pmd(entry));
        }
-
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

Reply via email to