Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

[linux-2.6-microblaze.git] / lib / cpumask.c

diff --git a/lib/cpumask.c b/lib/cpumask.c
index 0b66011..d327b87 100644 (file)
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -26,18 +26,6 @@ int __next_cpu_nr(int n, const cpumask_t *srcp)
 EXPORT_SYMBOL(__next_cpu_nr);
 #endif
 
-int __any_online_cpu(const cpumask_t *mask)
-{
-       int cpu;
-
-       for_each_cpu(cpu, mask) {
-               if (cpu_online(cpu))
-                       break;
-       }
-       return cpu;
-}
-EXPORT_SYMBOL(__any_online_cpu);
-
 /**
  * cpumask_next_and - get the next cpu in *src1p & *src2p
  * @n: the cpu prior to the place to search (ie. return will be > @n)
@@ -173,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