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

Pull smp hotplug updates from Thomas Gleixner:
 "This is the next part of the hotplug rework.

   - Convert all notifiers with a priority assigned

   - Convert all CPU_STARTING/DYING notifiers

     The final removal of the STARTING/DYING infrastructure will happen
     when the merge window closes.

  Another 700 hundred line of unpenetrable maze gone :)"

* 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (70 commits)
  timers/core: Correct callback order during CPU hot plug
  leds/trigger/cpu: Move from CPU_STARTING to ONLINE level
  powerpc/numa: Convert to hotplug state machine
  arm/perf: Fix hotplug state machine conversion
  irqchip/armada: Avoid unused function warnings
  ARC/time: Convert to hotplug state machine
  clocksource/atlas7: Convert to hotplug state machine
  clocksource/armada-370-xp: Convert to hotplug state machine
  clocksource/exynos_mct: Convert to hotplug state machine
  clocksource/arm_global_timer: Convert to hotplug state machine
  rcu: Convert rcutree to hotplug state machine
  KVM/arm/arm64/vgic-new: Convert to hotplug state machine
  smp/cfd: Convert core to hotplug state machine
  x86/x2apic: Convert to CPU hotplug state machine
  profile: Convert to hotplug state machine
  timers/core: Convert to hotplug state machine
  hrtimer: Convert to hotplug state machine
  x86/tboot: Convert to hotplug state machine
  arm64/armv8 deprecated: Convert to hotplug state machine
  hwtracing/coresight-etm4x: Convert to hotplug state machine
  ...

1 files changed, 10 insertions, 19 deletions

diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index cefacbad1531..456316f6c868 100644
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -215,26 +215,18 @@ void apbt_setup_secondary_clock(void)
  * cpu timers during the offline process due to the ordering of notification.
  * the extra interrupt is harmless.
  */
-static int apbt_cpuhp_notify(struct notifier_block *n,
-                             unsigned long action, void *hcpu)
+static int apbt_cpu_dead(unsigned int cpu)
 {
-        unsigned long cpu = (unsigned long)hcpu;
         struct apbt_dev *adev = &per_cpu(cpu_apbt_dev, cpu);
 
-        switch (action & ~CPU_TASKS_FROZEN) {
-        case CPU_DEAD:
-                dw_apb_clockevent_pause(adev->timer);
-                if (system_state == SYSTEM_RUNNING) {
-                        pr_debug("skipping APBT CPU %lu offline\n", cpu);
-                } else {
-                        pr_debug("APBT clockevent for cpu %lu offline\n", cpu);
-                        dw_apb_clockevent_stop(adev->timer);
-                }
-                break;
-        default:
-                pr_debug("APBT notified %lu, no action\n", action);
+        dw_apb_clockevent_pause(adev->timer);
+        if (system_state == SYSTEM_RUNNING) {
+                pr_debug("skipping APBT CPU %u offline\n", cpu);
+        } else {
+                pr_debug("APBT clockevent for cpu %u offline\n", cpu);
+                dw_apb_clockevent_stop(adev->timer);
         }
-        return NOTIFY_OK;
+        return 0;
 }
 
 static __init int apbt_late_init(void)
@@ -242,9 +234,8 @@ static __init int apbt_late_init(void)
         if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT ||
                 !apb_timer_block_enabled)
                 return 0;
-        /* This notifier should be called after workqueue is ready */
-        hotcpu_notifier(apbt_cpuhp_notify, -20);
-        return 0;
+        return cpuhp_setup_state(CPUHP_X86_APB_DEAD, "X86_APB_DEAD", NULL,
+                                 apbt_cpu_dead);
 }
 fs_initcall(apbt_late_init);
 #else