Commit 91df4d52 authored by Paul Mackerras's avatar Paul Mackerras

PPC32: Use vunmap rather than vfree in iounmap.

parent e42e97d6
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/config.h> #include <linux/config.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/mm.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/highmem.h> #include <linux/highmem.h>
...@@ -202,7 +203,7 @@ __ioremap(unsigned long addr, unsigned long size, unsigned long flags) ...@@ -202,7 +203,7 @@ __ioremap(unsigned long addr, unsigned long size, unsigned long flags)
err = map_page(v+i, p+i, flags); err = map_page(v+i, p+i, flags);
if (err) { if (err) {
if (mem_init_done) if (mem_init_done)
vfree((void *)v); vunmap((void *)v);
return NULL; return NULL;
} }
...@@ -219,7 +220,7 @@ void iounmap(void *addr) ...@@ -219,7 +220,7 @@ void iounmap(void *addr)
if (v_mapped_by_bats((unsigned long)addr)) return; if (v_mapped_by_bats((unsigned long)addr)) return;
if (addr > high_memory && (unsigned long) addr < ioremap_bot) if (addr > high_memory && (unsigned long) addr < ioremap_bot)
vfree((void *) (PAGE_MASK & (unsigned long) addr)); vunmap((void *) (PAGE_MASK & (unsigned long)addr));
} }
#endif /* CONFIG_PPC_ISERIES */ #endif /* CONFIG_PPC_ISERIES */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment