4 files changed, 22 insertions, 14 deletions

diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index 55accb7018bb..cc70f3fdcdd1 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -269,16 +269,17 @@ acpi_status acpi_hw_clear_acpi_status(void)
 
         status = acpi_hw_register_write(ACPI_REGISTER_PM1_STATUS,
                                         ACPI_BITMASK_ALL_FIXED_STATUS);
-        if (ACPI_FAILURE(status)) {
-                goto unlock_and_exit;
-        }
+
+        acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
+
+        if (ACPI_FAILURE(status))
+                goto exit;
 
         /* Clear the GPE Bits in all GPE registers in all GPE blocks */
 
         status = acpi_ev_walk_gpe_list(acpi_hw_clear_gpe_block, NULL);
 
-      unlock_and_exit:
-        acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
+exit:
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 437ddbf0c49a..9ecec98bc76e 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -911,10 +911,7 @@ void __init acpi_early_init(void)
         }
 #endif
 
-        status =
-            acpi_enable_subsystem(~
-                                  (ACPI_NO_HARDWARE_INIT |
-                                   ACPI_NO_ACPI_ENABLE));
+        status = acpi_enable_subsystem(~ACPI_NO_ACPI_ENABLE);
         if (ACPI_FAILURE(status)) {
                 printk(KERN_ERR PREFIX "Unable to enable ACPI\n");
                 goto error0;
@@ -935,8 +932,7 @@ static int __init acpi_bus_init(void)
 
         acpi_os_initialize1();
 
-        status =
-            acpi_enable_subsystem(ACPI_NO_HARDWARE_INIT | ACPI_NO_ACPI_ENABLE);
+        status = acpi_enable_subsystem(ACPI_NO_ACPI_ENABLE);
         if (ACPI_FAILURE(status)) {
                 printk(KERN_ERR PREFIX
                        "Unable to start the ACPI Interpreter\n");
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 449c556274c0..8ab80bafe3f1 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1062,13 +1062,12 @@ static void acpi_add_id(struct acpi_device *device, const char *dev_id)
         if (!id)
                 return;
 
-        id->id = kmalloc(strlen(dev_id) + 1, GFP_KERNEL);
+        id->id = kstrdup(dev_id, GFP_KERNEL);
         if (!id->id) {
                 kfree(id);
                 return;
         }
 
-        strcpy(id->id, dev_id);
         list_add_tail(&id->list, &device->pnp.ids);
 }
 
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index c538d0ef10ff..9f66181c814e 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -706,11 +706,23 @@ static void __exit interrupt_stats_exit(void)
         return;
 }
 
+static ssize_t
+acpi_show_profile(struct device *dev, struct device_attribute *attr,
+                  char *buf)
+{
+        return sprintf(buf, "%d\n", acpi_gbl_FADT.preferred_profile);
+}
+
+static const struct device_attribute pm_profile_attr =
+        __ATTR(pm_profile, S_IRUGO, acpi_show_profile, NULL);
+
 int __init acpi_sysfs_init(void)
 {
         int result;
 
         result = acpi_tables_sysfs_init();
-
+        if (result)
+                return result;
+        result = sysfs_create_file(acpi_kobj, &pm_profile_attr.attr);
         return result;
 }