Merge tag 'pm+acpi-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management and ACPI updates from Rafael J Wysocki:

 - ARM big.LITTLE cpufreq driver from Viresh Kumar.

 - exynos5440 cpufreq driver from Amit Daniel Kachhap.

 - cpufreq core cleanup and code consolidation from Viresh Kumar and
   Stratos Karafotis.

 - cpufreq scalability improvement from Nathan Zimmer.

 - AMD "frequency sensitivity feedback" powersave bias for the ondemand
   cpufreq governor from Jacob Shin.

 - cpuidle code consolidation and cleanups from Daniel Lezcano.

 - ARM OMAP cpuidle fixes from Santosh Shilimkar and Daniel Lezcano.

 - ACPICA fixes and other improvements from Bob Moore, Jung-uk Kim, Lv
   Zheng, Yinghai Lu, Tang Chen, Colin Ian King, and Linn Crosetto.

 - ACPI core updates related to hotplug from Toshi Kani, Paul Bolle,
   Yasuaki Ishimatsu, and Rafael J Wysocki.

 - Intel Lynxpoint LPSS (Low-Power Subsystem) support improvements from
   Rafael J Wysocki and Andy Shevchenko.

* tag 'pm+acpi-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (192 commits)
  cpufreq: Revert incorrect commit 5800043
  cpufreq: MAINTAINERS: Add co-maintainer
  cpuidle: add maintainer entry
  ACPI / thermal: do not always return THERMAL_TREND_RAISING for active trip points
  ARM: s3c64xx: cpuidle: use init/exit common routine
  cpufreq: pxa2xx: initialize variables
  ACPI: video: correct acpi_video_bus_add error processing
  SH: cpuidle: use init/exit common routine
  ARM: S5pv210: compiling issue, ARM_S5PV210_CPUFREQ needs CONFIG_CPU_FREQ_TABLE=y
  ACPI: Fix wrong parameter passed to memblock_reserve
  cpuidle: fix comment format
  pnp: use %*phC to dump small buffers
  isapnp: remove debug leftovers
  ARM: imx: cpuidle: use init/exit common routine
  ARM: davinci: cpuidle: use init/exit common routine
  ARM: kirkwood: cpuidle: use init/exit common routine
  ARM: calxeda: cpuidle: use init/exit common routine
  ARM: tegra: cpuidle: use init/exit common routine for tegra3
  ARM: tegra: cpuidle: use init/exit common routine for tegra2
  ARM: OMAP4: cpuidle: use init/exit common routine
  ...

1 files changed, 66 insertions, 0 deletions

diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 41c0504470db..fcae5fa2e1b3 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -7,6 +7,8 @@
 #include <linux/moduleparam.h>
 #include <acpi/acpi_drivers.h>
 
+#include "internal.h"
+
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("sysfs");
 
@@ -249,6 +251,7 @@ module_param_call(acpica_version, NULL, param_get_acpica_version, NULL, 0444);
 static LIST_HEAD(acpi_table_attr_list);
 static struct kobject *tables_kobj;
 static struct kobject *dynamic_tables_kobj;
+static struct kobject *hotplug_kobj;
 
 struct acpi_table_attr {
         struct bin_attribute attr;
@@ -716,6 +719,67 @@ acpi_show_profile(struct device *dev, struct device_attribute *attr,
 static const struct device_attribute pm_profile_attr =
         __ATTR(pm_profile, S_IRUGO, acpi_show_profile, NULL);
 
+static ssize_t hotplug_enabled_show(struct kobject *kobj,
+                                    struct kobj_attribute *attr, char *buf)
+{
+        struct acpi_hotplug_profile *hotplug = to_acpi_hotplug_profile(kobj);
+
+        return sprintf(buf, "%d\n", hotplug->enabled);
+}
+
+static ssize_t hotplug_enabled_store(struct kobject *kobj,
+                                     struct kobj_attribute *attr,
+                                     const char *buf, size_t size)
+{
+        struct acpi_hotplug_profile *hotplug = to_acpi_hotplug_profile(kobj);
+        unsigned int val;
+
+        if (kstrtouint(buf, 10, &val) || val > 1)
+                return -EINVAL;
+
+        acpi_scan_hotplug_enabled(hotplug, val);
+        return size;
+}
+
+static struct kobj_attribute hotplug_enabled_attr =
+        __ATTR(enabled, S_IRUGO | S_IWUSR, hotplug_enabled_show,
+                hotplug_enabled_store);
+
+static struct attribute *hotplug_profile_attrs[] = {
+        &hotplug_enabled_attr.attr,
+        NULL
+};
+
+static struct kobj_type acpi_hotplug_profile_ktype = {
+        .sysfs_ops = &kobj_sysfs_ops,
+        .default_attrs = hotplug_profile_attrs,
+};
+
+void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug,
+                                    const char *name)
+{
+        int error;
+
+        if (!hotplug_kobj)
+                goto err_out;
+
+        kobject_init(&hotplug->kobj, &acpi_hotplug_profile_ktype);
+        error = kobject_set_name(&hotplug->kobj, "%s", name);
+        if (error)
+                goto err_out;
+
+        hotplug->kobj.parent = hotplug_kobj;
+        error = kobject_add(&hotplug->kobj, hotplug_kobj, NULL);
+        if (error)
+                goto err_out;
+
+        kobject_uevent(&hotplug->kobj, KOBJ_ADD);
+        return;
+
+ err_out:
+        pr_err(PREFIX "Unable to add hotplug profile '%s'\n", name);
+}
+
 int __init acpi_sysfs_init(void)
 {
         int result;
@@ -723,6 +787,8 @@ int __init acpi_sysfs_init(void)
         result = acpi_tables_sysfs_init();
         if (result)
                 return result;
+
+        hotplug_kobj = kobject_create_and_add("hotplug", acpi_kobj);
         result = sysfs_create_file(acpi_kobj, &pm_profile_attr.attr);
         return result;
 }