]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
powerpc/cpumask: Convert smp_cpus_done to new cpumask API
authorAnton Blanchard <anton@samba.org>
Mon, 26 Apr 2010 15:32:34 +0000 (15:32 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 6 May 2010 07:16:13 +0000 (17:16 +1000)
Use the new cpumask_* functions and dynamically allocate the cpumask in
smp_cpus_done.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/kernel/smp.c

index 3fe4de2b685e3552710d15d3db089e2605d6993d..17523a0abf66d2c56e113157d62a9c877d0a945c 100644 (file)
@@ -562,19 +562,22 @@ int setup_profiling_timer(unsigned int multiplier)
 
 void __init smp_cpus_done(unsigned int max_cpus)
 {
-       cpumask_t old_mask;
+       cpumask_var_t old_mask;
 
        /* We want the setup_cpu() here to be called from CPU 0, but our
         * init thread may have been "borrowed" by another CPU in the meantime
         * se we pin us down to CPU 0 for a short while
         */
-       old_mask = current->cpus_allowed;
+       alloc_cpumask_var(&old_mask, GFP_NOWAIT);
+       cpumask_copy(old_mask, &current->cpus_allowed);
        set_cpus_allowed_ptr(current, cpumask_of(boot_cpuid));
        
        if (smp_ops && smp_ops->setup_cpu)
                smp_ops->setup_cpu(boot_cpuid);
 
-       set_cpus_allowed_ptr(current, &old_mask);
+       set_cpus_allowed_ptr(current, old_mask);
+
+       free_cpumask_var(old_mask);
 
        snapshot_timebases();