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

Pull CPU hotplug updates from Thomas Gleixner:
 "Yet another batch of cpu hotplug core updates and conversions:

   - Provide core infrastructure for multi instance drivers so the
     drivers do not have to keep custom lists.

   - Convert custom lists to the new infrastructure. The block-mq custom
     list conversion comes through the block tree and makes the diffstat
     tip over to more lines removed than added.

   - Handle unbalanced hotplug enable/disable calls more gracefully.

   - Remove the obsolete CPU_STARTING/DYING notifier support.

   - Convert another batch of notifier users.

   The relayfs changes which conflicted with the conversion have been
   shipped to me by Andrew.

   The remaining lot is targeted for 4.10 so that we finally can remove
   the rest of the notifiers"

* 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
  cpufreq: Fix up conversion to hotplug state machine
  blk/mq: Reserve hotplug states for block multiqueue
  x86/apic/uv: Convert to hotplug state machine
  s390/mm/pfault: Convert to hotplug state machine
  mips/loongson/smp: Convert to hotplug state machine
  mips/octeon/smp: Convert to hotplug state machine
  fault-injection/cpu: Convert to hotplug state machine
  padata: Convert to hotplug state machine
  cpufreq: Convert to hotplug state machine
  ACPI/processor: Convert to hotplug state machine
  virtio scsi: Convert to hotplug state machine
  oprofile/timer: Convert to hotplug state machine
  block/softirq: Convert to hotplug state machine
  lib/irq_poll: Convert to hotplug state machine
  x86/microcode: Convert to hotplug state machine
  sh/SH-X3 SMP: Convert to hotplug state machine
  ia64/mca: Convert to hotplug state machine
  ARM/OMAP/wakeupgen: Convert to hotplug state machine
  ARM/shmobile: Convert to hotplug state machine
  arm64/FP/SIMD: Convert to hotplug state machine
  ...

1 files changed, 25 insertions, 25 deletions

diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 834868b9fdc9..366e4f510fcf 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -852,37 +852,33 @@ static void smp_core99_setup_cpu(int cpu_nr)
 
 #ifdef CONFIG_PPC64
 #ifdef CONFIG_HOTPLUG_CPU
-static int smp_core99_cpu_notify(struct notifier_block *self,
-                                 unsigned long action, void *hcpu)
+static unsigned int smp_core99_host_open;
+
+static int smp_core99_cpu_prepare(unsigned int cpu)
 {
         int rc;
 
-        switch(action & ~CPU_TASKS_FROZEN) {
-        case CPU_UP_PREPARE:
-                /* Open i2c bus if it was used for tb sync */
-                if (pmac_tb_clock_chip_host) {
-                        rc = pmac_i2c_open(pmac_tb_clock_chip_host, 1);
-                        if (rc) {
-                                pr_err("Failed to open i2c bus for time sync\n");
-                                return notifier_from_errno(rc);
-                        }
+        /* Open i2c bus if it was used for tb sync */
+        if (pmac_tb_clock_chip_host && !smp_core99_host_open) {
+                rc = pmac_i2c_open(pmac_tb_clock_chip_host, 1);
+                if (rc) {
+                        pr_err("Failed to open i2c bus for time sync\n");
+                        return notifier_from_errno(rc);
                 }
-                break;
-        case CPU_ONLINE:
-        case CPU_UP_CANCELED:
-                /* Close i2c bus if it was used for tb sync */
-                if (pmac_tb_clock_chip_host)
-                        pmac_i2c_close(pmac_tb_clock_chip_host);
-                break;
-        default:
-                break;
+                smp_core99_host_open = 1;
         }
-        return NOTIFY_OK;
+        return 0;
 }
 
-static struct notifier_block smp_core99_cpu_nb = {
-        .notifier_call  = smp_core99_cpu_notify,
-};
+static int smp_core99_cpu_online(unsigned int cpu)
+{
+        /* Close i2c bus if it was used for tb sync */
+        if (pmac_tb_clock_chip_host && smp_core99_host_open) {
+                pmac_i2c_close(pmac_tb_clock_chip_host);
+                smp_core99_host_open = 0;
+        }
+        return 0;
+}
 #endif /* CONFIG_HOTPLUG_CPU */
 
 static void __init smp_core99_bringup_done(void)
@@ -902,7 +898,11 @@ static void __init smp_core99_bringup_done(void)
                 g5_phy_disable_cpu1();
         }
 #ifdef CONFIG_HOTPLUG_CPU
-        register_cpu_notifier(&smp_core99_cpu_nb);
+        cpuhp_setup_state_nocalls(CPUHP_POWERPC_PMAC_PREPARE,
+                                  "powerpc/pmac:prepare", smp_core99_cpu_prepare,
+                                  NULL);
+        cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "powerpc/pmac:online",
+                                  smp_core99_cpu_online, NULL);
 #endif
 
         if (ppc_md.progress)