Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

[mv-sheeva.git] / arch / sparc / kernel / mdesc.c

diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index 938da19dc06527d755d7ce0a9cc8171b39f654c7..cdc91d919e93c36219e19b8a58d9ea32de721e3b 100644 (file)
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -10,6 +10,7 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/miscdevice.h>
+#include <linux/bootmem.h>
 
 #include <asm/cpudata.h>
 #include <asm/hypervisor.h>
@@ -108,25 +109,15 @@ static struct mdesc_handle * __init mdesc_lmb_alloc(unsigned int mdesc_size)
 
 static void mdesc_lmb_free(struct mdesc_handle *hp)
 {
-       unsigned int alloc_size, handle_size = hp->handle_size;
-       unsigned long start, end;
+       unsigned int alloc_size;
+       unsigned long start;
 
        BUG_ON(atomic_read(&hp->refcnt) != 0);
        BUG_ON(!list_empty(&hp->list));
 
-       alloc_size = PAGE_ALIGN(handle_size);
-
-       start = (unsigned long) hp;
-       end = start + alloc_size;
-
-       while (start < end) {
-               struct page *p;
-
-               p = virt_to_page(start);
-               ClearPageReserved(p);
-               __free_page(p);
-               start += PAGE_SIZE;
-       }
+       alloc_size = PAGE_ALIGN(hp->handle_size);
+       start = __pa(hp);
+       free_bootmem_late(start, alloc_size);
 }
 
 static struct mdesc_mem_ops lmb_mdesc_ops = {