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

Commit 478922c2 authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

[ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM 



Patch from Catalin Marinas

This patch modifies the __ioremap_pfn and __iounmap functions in
arch/arm/mm/ioremap.c to use vunmap instead of vfree.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1d6760a3

arch/arm/mm/ioremap.c

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size, 
 		return NULL;

 	addr = (unsigned long)area->addr;

 	if (remap_area_pages(addr, pfn, size, flags)) {

 		vfree((void *)addr);

 		vunmap((void *)addr);

 		return NULL;

 	}

 	return (void __iomem *) (offset + (char *)addr);
@@ -173,7 +173,7 @@ EXPORT_SYMBOL(__ioremap); 


void __iounmap(void __iomem *addr)

{

	vfree((void *) (PAGE_MASK & (unsigned long) addr));

	vunmap((void *)(PAGE_MASK & (unsigned long)addr));

}

EXPORT_SYMBOL(__iounmap);