Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbd3bfd8 authored by Joerg Roedel's avatar Joerg Roedel Committed by Ingo Molnar
Browse files

x86: use __PAGE_KERNEL_EXEC in ioremap_64.c 



This patch replaces the manual permission setup for pages in ioremap_64.c with
the pre-defined __PAGE_KERNEL_EXEC value.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 718f9497

arch/x86/mm/ioremap_64.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -84,8 +84,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l 
	if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS)

	if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS)

		return (__force void __iomem *)phys_to_virt(phys_addr);

		return (__force void __iomem *)phys_to_virt(phys_addr);





	pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_GLOBAL

	pgprot = __pgprot(__PAGE_KERNEL_EXEC | _PAGE_GLOBAL | flags);

			  | _PAGE_DIRTY | _PAGE_ACCESSED | flags);

	/*

	/*

	 * Mappings have to be page-aligned

	 * Mappings have to be page-aligned

	 */

	 */