Merge branch 'acpi-hotplug'

* acpi-hotplug:
  ACPI / memhotplug: Use defined marco METHOD_NAME__STA
  ACPI / hotplug: Use kobject_init_and_add() instead of _init() and _add()
  ACPI / hotplug: Don't set kobject parent pointer explicitly
  ACPI / hotplug: Set kobject name via kobject_add(), not kobject_set_name()
  hotplug, powerpc, x86: Remove cpu_hotplug_driver_lock()
  hotplug / x86: Disable ARCH_CPU_PROBE_RELEASE on x86
  hotplug / x86: Add hotplug lock to missing places
  hotplug / x86: Fix online state in cpu0 debug interface

2 files changed, 16 insertions, 39 deletions

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 8e59abc237d7..930cd8af3503 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -844,18 +844,6 @@ void __cpu_die(unsigned int cpu)
                 smp_ops->cpu_die(cpu);
 }
 
-static DEFINE_MUTEX(powerpc_cpu_hotplug_driver_mutex);
-
-void cpu_hotplug_driver_lock()
-{
-        mutex_lock(&powerpc_cpu_hotplug_driver_mutex);
-}
-
-void cpu_hotplug_driver_unlock()
-{
-        mutex_unlock(&powerpc_cpu_hotplug_driver_mutex);
-}
-
 void cpu_die(void)
 {
         if (ppc_md.cpu_die)
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 7cfdaae1721a..a8fe5aa3d34f 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -404,46 +404,38 @@ static ssize_t dlpar_cpu_probe(const char *buf, size_t count)
         unsigned long drc_index;
         int rc;
 
-        cpu_hotplug_driver_lock();
         rc = strict_strtoul(buf, 0, &drc_index);
-        if (rc) {
-                rc = -EINVAL;
-                goto out;
-        }
+        if (rc)
+                return -EINVAL;
 
         parent = of_find_node_by_path("/cpus");
-        if (!parent) {
-                rc = -ENODEV;
-                goto out;
-        }
+        if (!parent)
+                return -ENODEV;
 
         dn = dlpar_configure_connector(drc_index, parent);
-        if (!dn) {
-                rc = -EINVAL;
-                goto out;
-        }
+        if (!dn)
+                return -EINVAL;
 
         of_node_put(parent);
 
         rc = dlpar_acquire_drc(drc_index);
         if (rc) {
                 dlpar_free_cc_nodes(dn);
-                rc = -EINVAL;
-                goto out;
+                return -EINVAL;
         }
 
         rc = dlpar_attach_node(dn);
         if (rc) {
                 dlpar_release_drc(drc_index);
                 dlpar_free_cc_nodes(dn);
-                goto out;
+                return rc;
         }
 
         rc = dlpar_online_cpu(dn);
-out:
-        cpu_hotplug_driver_unlock();
+        if (rc)
+                return rc;
 
-        return rc ? rc : count;
+        return count;
 }
 
 static int dlpar_offline_cpu(struct device_node *dn)
@@ -516,30 +508,27 @@ static ssize_t dlpar_cpu_release(const char *buf, size_t count)
                 return -EINVAL;
         }
 
-        cpu_hotplug_driver_lock();
         rc = dlpar_offline_cpu(dn);
         if (rc) {
                 of_node_put(dn);
-                rc = -EINVAL;
-                goto out;
+                return -EINVAL;
         }
 
         rc = dlpar_release_drc(*drc_index);
         if (rc) {
                 of_node_put(dn);
-                goto out;
+                return rc;
         }
 
         rc = dlpar_detach_node(dn);
         if (rc) {
                 dlpar_acquire_drc(*drc_index);
-                goto out;
+                return rc;
         }
 
         of_node_put(dn);
-out:
-        cpu_hotplug_driver_unlock();
-        return rc ? rc : count;
+
+        return count;
 }
 
 static int __init pseries_dlpar_init(void)