MIPS: BPF: Avoid unreachable code on little endian

[linux-drm-fsl-dcu.git] / kernel / smpboot.c

diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index 7c434c39f02a250f4721475910e881b43b603313..a818cbc73e147382488cb0ea5bb5c490c6a46e15 100644 (file)
--- a/kernel/smpboot.c
+++ b/kernel/smpboot.c
@@ -113,7 +113,8 @@ static int smpboot_thread_fn(void *data)
                if (kthread_should_stop()) {
                        __set_current_state(TASK_RUNNING);
                        preempt_enable();
-                       if (ht->cleanup)
+                       /* cleanup must mirror setup */
+                       if (ht->cleanup && td->status != HP_THREAD_NONE)
                                ht->cleanup(td->cpu, cpu_online(td->cpu));
                        kfree(td);
                        return 0;
@@ -259,15 +260,6 @@ static void smpboot_destroy_threads(struct smp_hotplug_thread *ht)
 {
        unsigned int cpu;
 
-       /* Unpark any threads that were voluntarily parked. */
-       for_each_cpu_not(cpu, ht->cpumask) {
-               if (cpu_online(cpu)) {
-                       struct task_struct *tsk = *per_cpu_ptr(ht->store, cpu);
-                       if (tsk)
-                               kthread_unpark(tsk);
-               }
-       }
-
        /* We need to destroy also the parked threads of offline cpus */
        for_each_possible_cpu(cpu) {
                struct task_struct *tsk = *per_cpu_ptr(ht->store, cpu);
@@ -281,19 +273,22 @@ static void smpboot_destroy_threads(struct smp_hotplug_thread *ht)
 }
 
 /**
- * smpboot_register_percpu_thread - Register a per_cpu thread related to hotplug
+ * smpboot_register_percpu_thread_cpumask - Register a per_cpu thread related
+ *                                         to hotplug
  * @plug_thread:       Hotplug thread descriptor
+ * @cpumask:           The cpumask where threads run
  *
  * Creates and starts the threads on all online cpus.
  */
-int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
+int smpboot_register_percpu_thread_cpumask(struct smp_hotplug_thread *plug_thread,
+                                          const struct cpumask *cpumask)
 {
        unsigned int cpu;
        int ret = 0;
 
        if (!alloc_cpumask_var(&plug_thread->cpumask, GFP_KERNEL))
                return -ENOMEM;
-       cpumask_copy(plug_thread->cpumask, cpu_possible_mask);
+       cpumask_copy(plug_thread->cpumask, cpumask);
 
        get_online_cpus();
        mutex_lock(&smpboot_threads_lock);
@@ -301,9 +296,11 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
                ret = __smpboot_create_thread(plug_thread, cpu);
                if (ret) {
                        smpboot_destroy_threads(plug_thread);
+                       free_cpumask_var(plug_thread->cpumask);
                        goto out;
                }
-               smpboot_unpark_thread(plug_thread, cpu);
+               if (cpumask_test_cpu(cpu, cpumask))
+                       smpboot_unpark_thread(plug_thread, cpu);
        }
        list_add(&plug_thread->list, &hotplug_threads);
 out:
@@ -311,7 +308,7 @@ out:
        put_online_cpus();
        return ret;
 }
-EXPORT_SYMBOL_GPL(smpboot_register_percpu_thread);
+EXPORT_SYMBOL_GPL(smpboot_register_percpu_thread_cpumask);
 
 /**
  * smpboot_unregister_percpu_thread - Unregister a per_cpu thread related to hotplug