aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/mm/imalloc.c3
-rw-r--r--arch/powerpc/mm/pgtable_64.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/imalloc.c b/arch/powerpc/mm/imalloc.c
index c831815c31f0..9eddf37303d7 100644
--- a/arch/powerpc/mm/imalloc.c
+++ b/arch/powerpc/mm/imalloc.c
@@ -301,7 +301,8 @@ void im_free(void * addr)
301 for (p = &imlist ; (tmp = *p) ; p = &tmp->next) { 301 for (p = &imlist ; (tmp = *p) ; p = &tmp->next) {
302 if (tmp->addr == addr) { 302 if (tmp->addr == addr) {
303 *p = tmp->next; 303 *p = tmp->next;
304 unmap_vm_area(tmp); 304 unmap_kernel_range((unsigned long)tmp->addr,
305 tmp->size);
305 kfree(tmp); 306 kfree(tmp);
306 mutex_unlock(&imlist_mutex); 307 mutex_unlock(&imlist_mutex);
307 return; 308 return;
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index ad6e135bf212..fa5c828d3876 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -240,7 +240,6 @@ int __ioremap_explicit(phys_addr_t pa, unsigned long ea,
240/* 240/*
241 * Unmap an IO region and remove it from imalloc'd list. 241 * Unmap an IO region and remove it from imalloc'd list.
242 * Access to IO memory should be serialized by driver. 242 * Access to IO memory should be serialized by driver.
243 * This code is modeled after vmalloc code - unmap_vm_area()
244 * 243 *
245 * XXX what about calls before mem_init_done (ie python_countermeasures()) 244 * XXX what about calls before mem_init_done (ie python_countermeasures())
246 */ 245 */