Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[deliverable/linux.git] / arch / x86 / kernel / apb_timer.c

diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index cefacbad153118620348bb1e3bc88838f75dcde7..456316f6c868dc1aff24585bdc9b0119e4804693 100644 (file)
--- 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