Commit:     a40343497e8983cdf07fde99c9081ee62b96f745
Parent:     ed724be65fa18833244d81b484e425fc838837fa
Author:     Thomas Gleixner <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:34:04 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:34:04 2008 +0100

    x86: fix ioremap pgprot inconsistency
    The pgprot flags which are handed into ioremap_page_range() are
    different to those which are set in change_page_attr(). The
    ioremap_page_range flags are executable, while the c_p_a flags are
    not. Also make the mappings global (which is a NOP currently on 32bit,
    although CPUs from PPRO+ onwards support it, but that's a separate
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
 arch/x86/mm/ioremap_32.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/x86/mm/ioremap_32.c b/arch/x86/mm/ioremap_32.c
index f8e6c47..18757f0 100644
--- a/arch/x86/mm/ioremap_32.c
+++ b/arch/x86/mm/ioremap_32.c
@@ -67,8 +67,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned 
long size, unsigned l
                                return NULL;
-       prot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY
-                       | _PAGE_ACCESSED | flags);
+       prot = MAKE_GLOBAL(__PAGE_KERNEL | flags);
         * Mappings have to be page-aligned
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

Reply via email to