bootmem: fix wrong call parameter for free_bootmem()

It is strange that alloc_bootmem() returns a virtual address and
free_bootmem() requires a physical address.  Anyway, free_bootmem()'s
first parameter should be physical address.

There are some call sites for free_bootmem() with virtual address.  So fix
them.

Signed-off-by: Joonsoo Kim <js1304@gmail.com>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/powerpc/platforms/cell/celleb_pci.c b/arch/powerpc/platforms/cell/celleb_pci.c
index abc8af43ea7c5abf293d56abca685963de63560b..173568140a32ec0df09c0269107c1caa7ec035c6 100644 (file)
--- a/arch/powerpc/platforms/cell/celleb_pci.c
+++ b/arch/powerpc/platforms/cell/celleb_pci.c
@@ -401,11 +401,11 @@ error:
        } else {
                if (config && *config) {
                        size = 256;
-                       free_bootmem((unsigned long)(*config), size);
+                       free_bootmem(__pa(*config), size);
                }
                if (res && *res) {
                        size = sizeof(struct celleb_pci_resource);
-                       free_bootmem((unsigned long)(*res), size);
+                       free_bootmem(__pa(*res), size);
                }
        }
 

diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 5b939509db3bf36bae876194669640b28ebb0428..9c6b964148628db7d626c2b5962ccc6b159c8aa8 100644 (file)
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -565,7 +565,7 @@ fail_msg_node:
 fail_db_node:
        of_node_put(smu->db_node);
 fail_bootmem:
-       free_bootmem((unsigned long)smu, sizeof(struct smu_device));
+       free_bootmem(__pa(smu), sizeof(struct smu_device));
        smu = NULL;
 fail_np:
        of_node_put(np);

diff --git a/lib/cpumask.c b/lib/cpumask.c
index 402a54ac35cbf60f665485ddd18500d5034e9ee9..d327b87c99b7ca28a222c20e6d05975bfa912e9e 100644 (file)
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -161,6 +161,6 @@ EXPORT_SYMBOL(free_cpumask_var);
  */
 void __init free_bootmem_cpumask_var(cpumask_var_t mask)
 {
-       free_bootmem((unsigned long)mask, cpumask_size());
+       free_bootmem(__pa(mask), cpumask_size());
 }
 #endif