9 files changed, 62 insertions, 65 deletions

diff --git a/Documentation/ABI/stable/sysfs-acpi-pmprofile b/Documentation/ABI/stable/sysfs-acpi-pmprofile
new file mode 100644
index 000000000000..964c7a8afb26
--- /dev/null
+++ b/Documentation/ABI/stable/sysfs-acpi-pmprofile
@@ -0,0 +1,22 @@
+What:           /sys/firmware/acpi/pm_profile
+Date:           03-Nov-2011
+KernelVersion:  v3.2
+Contact:        linux-acpi@vger.kernel.org
+Description:    The ACPI pm_profile sysfs interface exports the platform
+                power management (and performance) requirement expectations
+                as provided by BIOS. The integer value is directly passed as
+                retrieved from the FADT ACPI table.
+Values:         For possible values see ACPI specification:
+                5.2.9 Fixed ACPI Description Table (FADT)
+                Field: Preferred_PM_Profile
+
+                Currently these values are defined by spec:
+                0 Unspecified
+                1 Desktop
+                2 Mobile
+                3 Workstation
+                4 Enterprise Server
+                5 SOHO Server
+                6 Appliance PC
+                7 Performance Server
+                >7 Reserved
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;
 }
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index bbf3edd85beb..5be4a392a3ae 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -509,15 +509,12 @@ static __init void pnpacpi_parse_dma_option(struct pnp_dev *dev,
                                             struct acpi_resource_dma *p)
 {
         int i;
-        unsigned char map = 0, flags = 0;
-
-        if (p->channel_count == 0)
-                flags |= IORESOURCE_DISABLED;
+        unsigned char map = 0, flags;
 
         for (i = 0; i < p->channel_count; i++)
                 map |= 1 << p->channels[i];
 
-        flags |= dma_flags(dev, p->type, p->bus_master, p->transfer);
+        flags = dma_flags(dev, p->type, p->bus_master, p->transfer);
         pnp_register_dma_resource(dev, option_flags, map, flags);
 }
 
@@ -527,17 +524,14 @@ static __init void pnpacpi_parse_irq_option(struct pnp_dev *dev,
 {
         int i;
         pnp_irq_mask_t map;
-        unsigned char flags = 0;
-
-        if (p->interrupt_count == 0)
-                flags |= IORESOURCE_DISABLED;
+        unsigned char flags;
 
         bitmap_zero(map.bits, PNP_IRQ_NR);
         for (i = 0; i < p->interrupt_count; i++)
                 if (p->interrupts[i])
                         __set_bit(p->interrupts[i], map.bits);
 
-        flags |= irq_flags(p->triggering, p->polarity, p->sharable);
+        flags = irq_flags(p->triggering, p->polarity, p->sharable);
         pnp_register_irq_resource(dev, option_flags, &map, flags);
 }
 
@@ -547,10 +541,7 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev,
 {
         int i;
         pnp_irq_mask_t map;
-        unsigned char flags = 0;
-
-        if (p->interrupt_count == 0)
-                flags |= IORESOURCE_DISABLED;
+        unsigned char flags;
 
         bitmap_zero(map.bits, PNP_IRQ_NR);
         for (i = 0; i < p->interrupt_count; i++) {
@@ -564,7 +555,7 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev,
                 }
         }
 
-        flags |= irq_flags(p->triggering, p->polarity, p->sharable);
+        flags = irq_flags(p->triggering, p->polarity, p->sharable);
         pnp_register_irq_resource(dev, option_flags, &map, flags);
 }
 
@@ -574,11 +565,8 @@ static __init void pnpacpi_parse_port_option(struct pnp_dev *dev,
 {
         unsigned char flags = 0;
 
-        if (io->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         if (io->io_decode == ACPI_DECODE_16)
-                flags |= IORESOURCE_IO_16BIT_ADDR;
+                flags = IORESOURCE_IO_16BIT_ADDR;
         pnp_register_port_resource(dev, option_flags, io->minimum, io->maximum,
                                    io->alignment, io->address_length, flags);
 }
@@ -587,13 +575,8 @@ static __init void pnpacpi_parse_fixed_port_option(struct pnp_dev *dev,
                                         unsigned int option_flags,
                                         struct acpi_resource_fixed_io *io)
 {
-        unsigned char flags = 0;
-
-        if (io->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         pnp_register_port_resource(dev, option_flags, io->address, io->address,
-                                   0, io->address_length, flags | IORESOURCE_IO_FIXED);
+                                   0, io->address_length, IORESOURCE_IO_FIXED);
 }
 
 static __init void pnpacpi_parse_mem24_option(struct pnp_dev *dev,
@@ -602,11 +585,8 @@ static __init void pnpacpi_parse_mem24_option(struct pnp_dev *dev,
 {
         unsigned char flags = 0;
 
-        if (p->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         if (p->write_protect == ACPI_READ_WRITE_MEMORY)
-                flags |= IORESOURCE_MEM_WRITEABLE;
+                flags = IORESOURCE_MEM_WRITEABLE;
         pnp_register_mem_resource(dev, option_flags, p->minimum, p->maximum,
                                   p->alignment, p->address_length, flags);
 }
@@ -617,11 +597,8 @@ static __init void pnpacpi_parse_mem32_option(struct pnp_dev *dev,
 {
         unsigned char flags = 0;
 
-        if (p->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         if (p->write_protect == ACPI_READ_WRITE_MEMORY)
-                flags |= IORESOURCE_MEM_WRITEABLE;
+                flags = IORESOURCE_MEM_WRITEABLE;
         pnp_register_mem_resource(dev, option_flags, p->minimum, p->maximum,
                                   p->alignment, p->address_length, flags);
 }
@@ -632,11 +609,8 @@ static __init void pnpacpi_parse_fixed_mem32_option(struct pnp_dev *dev,
 {
         unsigned char flags = 0;
 
-        if (p->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         if (p->write_protect == ACPI_READ_WRITE_MEMORY)
-                flags |= IORESOURCE_MEM_WRITEABLE;
+                flags = IORESOURCE_MEM_WRITEABLE;
         pnp_register_mem_resource(dev, option_flags, p->address, p->address,
                                   0, p->address_length, flags);
 }
@@ -656,19 +630,16 @@ static __init void pnpacpi_parse_address_option(struct pnp_dev *dev,
                 return;
         }
 
-        if (p->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         if (p->resource_type == ACPI_MEMORY_RANGE) {
                 if (p->info.mem.write_protect == ACPI_READ_WRITE_MEMORY)
-                        flags |= IORESOURCE_MEM_WRITEABLE;
+                        flags = IORESOURCE_MEM_WRITEABLE;
                 pnp_register_mem_resource(dev, option_flags, p->minimum,
                                           p->minimum, 0, p->address_length,
                                           flags);
         } else if (p->resource_type == ACPI_IO_RANGE)
                 pnp_register_port_resource(dev, option_flags, p->minimum,
                                            p->minimum, 0, p->address_length,
-                                           flags | IORESOURCE_IO_FIXED);
+                                           IORESOURCE_IO_FIXED);
 }
 
 static __init void pnpacpi_parse_ext_address_option(struct pnp_dev *dev,
@@ -678,19 +649,16 @@ static __init void pnpacpi_parse_ext_address_option(struct pnp_dev *dev,
         struct acpi_resource_extended_address64 *p = &r->data.ext_address64;
         unsigned char flags = 0;
 
-        if (p->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         if (p->resource_type == ACPI_MEMORY_RANGE) {
                 if (p->info.mem.write_protect == ACPI_READ_WRITE_MEMORY)
-                        flags |= IORESOURCE_MEM_WRITEABLE;
+                        flags = IORESOURCE_MEM_WRITEABLE;
                 pnp_register_mem_resource(dev, option_flags, p->minimum,
                                           p->minimum, 0, p->address_length,
                                           flags);
         } else if (p->resource_type == ACPI_IO_RANGE)
                 pnp_register_port_resource(dev, option_flags, p->minimum,
                                            p->minimum, 0, p->address_length,
-                                           flags | IORESOURCE_IO_FIXED);
+                                           IORESOURCE_IO_FIXED);
 }
 
 struct acpipnp_parse_option_s {
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 708f8e92771a..dd9a5743fa99 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -678,10 +678,10 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,
                 return;
 
         if (delay > 1000)
-                schedule_delayed_work(&(tz->poll_queue),
+                queue_delayed_work(system_freezable_wq, &(tz->poll_queue),
                                       round_jiffies(msecs_to_jiffies(delay)));
         else
-                schedule_delayed_work(&(tz->poll_queue),
+                queue_delayed_work(system_freezable_wq, &(tz->poll_queue),
                                       msecs_to_jiffies(delay));
 }
 
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index e49c36d38d7e..bb145e4b935e 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -144,7 +144,7 @@ static inline void unregister_dock_notifier(struct notifier_block *nb)
 {
 }
 static inline int register_hotplug_dock_device(acpi_handle handle,
-                                               struct acpi_dock_ops *ops,
+                                               const struct acpi_dock_ops *ops,
                                                void *context)
 {
         return -ENODEV;
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index b67231bef632..ed73f6705c86 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -470,7 +470,6 @@ typedef u64 acpi_integer;
  */
 #define ACPI_FULL_INITIALIZATION        0x00
 #define ACPI_NO_ADDRESS_SPACE_INIT      0x01
-#define ACPI_NO_HARDWARE_INIT           0x02
 #define ACPI_NO_EVENT_INIT              0x04
 #define ACPI_NO_HANDLER_INIT            0x08
 #define ACPI_NO_ACPI_ENABLE             0x10