Merge branch 'master' into staging-next

[karo-tx-linux.git] / lib / cpumask.c

diff --git a/lib/cpumask.c b/lib/cpumask.c
index d327b87c99b7ca28a222c20e6d05975bfa912e9e..b810b753c607500a9aab3aedd3060cb6c35189fd 100644 (file)
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -140,7 +140,7 @@ EXPORT_SYMBOL(zalloc_cpumask_var);
  */
 void __init alloc_bootmem_cpumask_var(cpumask_var_t *mask)
 {
-       *mask = alloc_bootmem(cpumask_size());
+       *mask = memblock_virt_alloc(cpumask_size(), 0);
 }
 
 /**
@@ -161,6 +161,6 @@ EXPORT_SYMBOL(free_cpumask_var);
  */
 void __init free_bootmem_cpumask_var(cpumask_var_t mask)
 {
-       free_bootmem(__pa(mask), cpumask_size());
+       memblock_free_early(__pa(mask), cpumask_size());
 }
 #endif