Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / kernel / cpu.c

diff --git a/kernel/cpu.c b/kernel/cpu.c
index b69c0588f8c9ccbece87abcd4419cf657a2c31e4..b03a32595cfebc34cf60e353b75028870477c4fe 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1160,6 +1160,11 @@ static struct cpuhp_step cpuhp_ap_states[] = {
                .startup.single         = smpboot_unpark_threads,
                .teardown.single        = NULL,
        },
+       [CPUHP_AP_IRQ_AFFINITY_ONLINE] = {
+               .name                   = "irq/affinity:online",
+               .startup.single         = irq_affinity_online_cpu,
+               .teardown.single        = NULL,
+       },
        [CPUHP_AP_PERF_ONLINE] = {
                .name                   = "perf:online",
                .startup.single         = perf_event_init_cpu,
@@ -1603,13 +1608,13 @@ static ssize_t write_cpuhp_target(struct device *dev,
        ret = !sp->name || sp->cant_stop ? -EINVAL : 0;
        mutex_unlock(&cpuhp_state_mutex);
        if (ret)
-               return ret;
+               goto out;
 
        if (st->state < target)
                ret = do_cpu_up(dev->id, target);
        else
                ret = do_cpu_down(dev->id, target);
-
+out:
        unlock_device_hotplug();
        return ret ? ret : count;
 }