Commit 75ab43bf authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: ioremap remove the range check of cpa 



Now that cpa works on non-direct mappings as well, we can safely
remove the range check in ioremap_change_attr().

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e66aadbe

arch/x86/mm/ioremap.c

+2 −15
Original line number Diff line number Diff line
@@ -70,25 +70,12 @@ int page_is_ram(unsigned long pagenr) 
 * Fix up the linear direct mapping of the kernel to avoid cache attribute

 * conflicts.

 */

static int ioremap_change_attr(unsigned long paddr, unsigned long size,

static int ioremap_change_attr(unsigned long vaddr, unsigned long size,

			       enum ioremap_mode mode)

{

	unsigned long vaddr = (unsigned long)__va(paddr);

	unsigned long nrpages = size >> PAGE_SHIFT;

	unsigned int level;

	int err;



	/* No change for pages after the last mapping */

	if ((paddr + size - 1) >= (max_pfn_mapped << PAGE_SHIFT))

		return 0;



	/*

	 * If there is no identity map for this address,

	 * change_page_attr_addr is unnecessary

	 */

	if (!lookup_address(vaddr, &level))

		return 0;



	switch (mode) {

	case IOR_MODE_UNCACHED:

	default:
@@ -169,7 +156,7 @@ static void __iomem *__ioremap(unsigned long phys_addr, unsigned long size, 
		return NULL;

	}



	if (ioremap_change_attr(phys_addr, size, mode) < 0) {

	if (ioremap_change_attr(vaddr, size, mode) < 0) {

		vunmap(area->addr);

		return NULL;

	}