Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / lib / cpumask.c

diff --git a/lib/cpumask.c b/lib/cpumask.c
index 5ceb421..8d03f22 100644 (file)
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -67,6 +67,7 @@ int cpumask_any_but(const struct cpumask *mask, unsigned int cpu)
 {
        unsigned int i;
 
+       cpumask_check(cpu);
        for_each_cpu(i, mask)
                if (i != cpu)
                        break;
@@ -107,4 +108,9 @@ void free_cpumask_var(cpumask_var_t mask)
        kfree(mask);
 }
 EXPORT_SYMBOL(free_cpumask_var);
+
+void __init free_bootmem_cpumask_var(cpumask_var_t mask)
+{
+       free_bootmem((unsigned long)mask, cpumask_size());
+}
 #endif