Commit a4034349 authored Jan 30, 2008 by Thomas Gleixner Committed by Ingo Molnar Jan 30, 2008

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
fix.)

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent ed724be6

arch/x86/mm/ioremap_32.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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