14 files changed, 254 insertions, 211 deletions

diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index baa5fc05e124..db307a356f08 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -211,6 +211,12 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
 
 ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep)
 
+static unsigned int gts, bfs;
+module_param(gts, uint, 0644);
+module_param(bfs, uint, 0644);
+MODULE_PARM_DESC(gts, "Enable evaluation of _GTS on suspend.");
+MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".);
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_enter_sleep_state
@@ -278,16 +284,18 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
                 return_ACPI_STATUS(status);
         }
 
-        /* Execute the _GTS method */
+        if (gts) {
+                /* Execute the _GTS method */
 
-        arg_list.count = 1;
-        arg_list.pointer = &arg;
-        arg.type = ACPI_TYPE_INTEGER;
-        arg.integer.value = sleep_state;
+                arg_list.count = 1;
+                arg_list.pointer = &arg;
+                arg.type = ACPI_TYPE_INTEGER;
+                arg.integer.value = sleep_state;
 
-        status = acpi_evaluate_object(NULL, METHOD_NAME__GTS, &arg_list, NULL);
-        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                return_ACPI_STATUS(status);
+                status = acpi_evaluate_object(NULL, METHOD_NAME__GTS, &arg_list, NULL);
+                if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                        return_ACPI_STATUS(status);
+                }
         }
 
         /* Get current value of PM1A control */
@@ -513,18 +521,19 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state)
                 }
         }
 
-        /* Execute the _BFS method */
+        if (bfs) {
+                /* Execute the _BFS method */
 
-        arg_list.count = 1;
-        arg_list.pointer = &arg;
-        arg.type = ACPI_TYPE_INTEGER;
-        arg.integer.value = sleep_state;
+                arg_list.count = 1;
+                arg_list.pointer = &arg;
+                arg.type = ACPI_TYPE_INTEGER;
+                arg.integer.value = sleep_state;
 
-        status = acpi_evaluate_object(NULL, METHOD_NAME__BFS, &arg_list, NULL);
-        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
+                status = acpi_evaluate_object(NULL, METHOD_NAME__BFS, &arg_list, NULL);
+                if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                        ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
+                }
         }
-
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c
index bd3c937b0ac0..ec33f270c5b7 100644
--- a/drivers/acpi/acpica/hwvalid.c
+++ b/drivers/acpi/acpica/hwvalid.c
@@ -152,7 +152,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
                 ACPI_ERROR((AE_INFO,
                             "Illegal I/O port address/length above 64K: 0x%p/%X",
                             ACPI_CAST_PTR(void, address), byte_width));
-                return_ACPI_STATUS(AE_AML_ILLEGAL_ADDRESS);
+                return_ACPI_STATUS(AE_LIMIT);
         }
 
         /* Exit if requested address is not within the protected port table */
@@ -179,11 +179,12 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
                         /* Port illegality may depend on the _OSI calls made by the BIOS */
 
                         if (acpi_gbl_osi_data >= port_info->osi_dependency) {
-                                ACPI_ERROR((AE_INFO,
-                                            "Denied AML access to port 0x%p/%X (%s 0x%.4X-0x%.4X)",
-                                            ACPI_CAST_PTR(void, address),
-                                            byte_width, port_info->name,
-                                            port_info->start, port_info->end));
+                                ACPI_DEBUG_PRINT((ACPI_DB_IO,
+                                                  "Denied AML access to port 0x%p/%X (%s 0x%.4X-0x%.4X)",
+                                                  ACPI_CAST_PTR(void, address),
+                                                  byte_width, port_info->name,
+                                                  port_info->start,
+                                                  port_info->end));
 
                                 return_ACPI_STATUS(AE_AML_ILLEGAL_ADDRESS);
                         }
@@ -207,7 +208,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
  *              Value               Where value is placed
  *              Width               Number of bits
  *
- * RETURN:      Value read from port
+ * RETURN:      Status and value read from port
  *
  * DESCRIPTION: Read data from an I/O port or register. This is a front-end
  *              to acpi_os_read_port that performs validation on both the port
@@ -218,14 +219,43 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
 acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)
 {
         acpi_status status;
+        u32 one_byte;
+        u32 i;
+
+        /* Validate the entire request and perform the I/O */
 
         status = acpi_hw_validate_io_request(address, width);
-        if (ACPI_FAILURE(status)) {
+        if (ACPI_SUCCESS(status)) {
+                status = acpi_os_read_port(address, value, width);
                 return status;
         }
 
-        status = acpi_os_read_port(address, value, width);
-        return status;
+        if (status != AE_AML_ILLEGAL_ADDRESS) {
+                return status;
+        }
+
+        /*
+         * There has been a protection violation within the request. Fall
+         * back to byte granularity port I/O and ignore the failing bytes.
+         * This provides Windows compatibility.
+         */
+        for (i = 0, *value = 0; i < width; i += 8) {
+
+                /* Validate and read one byte */
+
+                if (acpi_hw_validate_io_request(address, 8) == AE_OK) {
+                        status = acpi_os_read_port(address, &one_byte, 8);
+                        if (ACPI_FAILURE(status)) {
+                                return status;
+                        }
+
+                        *value |= (one_byte << i);
+                }
+
+                address++;
+        }
+
+        return AE_OK;
 }
 
 /******************************************************************************
@@ -236,7 +266,7 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)
  *              Value               Value to write
  *              Width               Number of bits
  *
- * RETURN:      None
+ * RETURN:      Status
  *
  * DESCRIPTION: Write data to an I/O port or register. This is a front-end
  *              to acpi_os_write_port that performs validation on both the port
@@ -247,12 +277,39 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)
 acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width)
 {
         acpi_status status;
+        u32 i;
+
+        /* Validate the entire request and perform the I/O */
 
         status = acpi_hw_validate_io_request(address, width);
-        if (ACPI_FAILURE(status)) {
+        if (ACPI_SUCCESS(status)) {
+                status = acpi_os_write_port(address, value, width);
                 return status;
         }
 
-        status = acpi_os_write_port(address, value, width);
-        return status;
+        if (status != AE_AML_ILLEGAL_ADDRESS) {
+                return status;
+        }
+
+        /*
+         * There has been a protection violation within the request. Fall
+         * back to byte granularity port I/O and ignore the failing bytes.
+         * This provides Windows compatibility.
+         */
+        for (i = 0; i < width; i += 8) {
+
+                /* Validate and write one byte */
+
+                if (acpi_hw_validate_io_request(address, 8) == AE_OK) {
+                        status =
+                            acpi_os_write_port(address, (value >> i) & 0xFF, 8);
+                        if (ACPI_FAILURE(status)) {
+                                return status;
+                        }
+                }
+
+                address++;
+        }
+
+        return AE_OK;
 }
diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c
index 663f692fffcf..a3c23d686d5f 100644
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -191,8 +191,6 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
         user_prt = ACPI_CAST_PTR(struct acpi_pci_routing_table, buffer);
 
         for (index = 0; index < number_of_elements; index++) {
-                int source_name_index = 2;
-                int source_index_index = 3;
 
                 /*
                  * Point user_prt past this current structure
@@ -261,27 +259,6 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                         return_ACPI_STATUS(AE_BAD_DATA);
                 }
 
-                /*
-                 * If BIOS erroneously reversed the _PRT source_name and source_index,
-                 * then reverse them back.
-                 */
-                if ((sub_object_list[3])->common.type !=
-                    ACPI_TYPE_INTEGER) {
-                        if (acpi_gbl_enable_interpreter_slack) {
-                                source_name_index = 3;
-                                source_index_index = 2;
-                                printk(KERN_WARNING
-                                       "ACPI: Handling Garbled _PRT entry\n");
-                        } else {
-                                ACPI_ERROR((AE_INFO,
-                                            "(PRT[%X].source_index) Need Integer, found %s",
-                                            index,
-                                            acpi_ut_get_object_type_name
-                                            (sub_object_list[3])));
-                                return_ACPI_STATUS(AE_BAD_DATA);
-                        }
-                }
-
                 user_prt->pin = (u32) obj_desc->integer.value;
 
                 /*
@@ -304,7 +281,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                  * 3) Third subobject: Dereference the PRT.source_name
                  * The name may be unresolved (slack mode), so allow a null object
                  */
-                obj_desc = sub_object_list[source_name_index];
+                obj_desc = sub_object_list[2];
                 if (obj_desc) {
                         switch (obj_desc->common.type) {
                         case ACPI_TYPE_LOCAL_REFERENCE:
@@ -378,7 +355,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
 
                 /* 4) Fourth subobject: Dereference the PRT.source_index */
 
-                obj_desc = sub_object_list[source_index_index];
+                obj_desc = sub_object_list[3];
                 if (obj_desc->common.type != ACPI_TYPE_INTEGER) {
                         ACPI_ERROR((AE_INFO,
                                     "(PRT[%X].SourceIndex) Need Integer, found %s",
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 04e90443eff7..391f331674c7 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1065,6 +1065,7 @@ static int acpi_ec_resume(struct acpi_device *device)
         struct acpi_ec *ec = acpi_driver_data(device);
         /* Enable use of GPE back */
         clear_bit(EC_FLAGS_NO_GPE, &ec->flags);
+        set_bit(EC_FLAGS_GPE_MODE, &ec->flags);
         acpi_enable_gpe(NULL, ec->gpe);
         return 0;
 }
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index d59f08ecaf16..d916bea729f1 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -353,8 +353,10 @@ static irqreturn_t acpi_irq(int irq, void *dev_id)
         if (handled) {
                 acpi_irq_handled++;
                 return IRQ_HANDLED;
-        } else
+        } else {
+                acpi_irq_not_handled++;
                 return IRQ_NONE;
+        }
 }
 
 acpi_status
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index 05dfdc96802e..d0d550d22a6d 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -343,9 +343,6 @@ acpi_system_write_alarm(struct file *file,
 }
 #endif                          /* HAVE_ACPI_LEGACY_ALARM */
 
-extern struct list_head acpi_wakeup_device_list;
-extern spinlock_t acpi_device_lock;
-
 static int
 acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
 {
@@ -353,7 +350,7 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
 
         seq_printf(seq, "Device\tS-state\t  Status   Sysfs node\n");
 
-        spin_lock(&acpi_device_lock);
+        mutex_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                 struct acpi_device *dev =
                     container_of(node, struct acpi_device, wakeup_list);
@@ -361,7 +358,6 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
 
                 if (!dev->wakeup.flags.valid)
                         continue;
-                spin_unlock(&acpi_device_lock);
 
                 ldev = acpi_get_physical_device(dev->handle);
                 seq_printf(seq, "%s\t  S%d\t%c%-8s  ",
@@ -376,9 +372,8 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
                 seq_printf(seq, "\n");
                 put_device(ldev);
 
-                spin_lock(&acpi_device_lock);
         }
-        spin_unlock(&acpi_device_lock);
+        mutex_unlock(&acpi_device_lock);
         return 0;
 }
 
@@ -409,7 +404,7 @@ acpi_system_write_wakeup_device(struct file *file,
         strbuf[len] = '\0';
         sscanf(strbuf, "%s", str);
 
-        spin_lock(&acpi_device_lock);
+        mutex_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                 struct acpi_device *dev =
                     container_of(node, struct acpi_device, wakeup_list);
@@ -446,7 +441,7 @@ acpi_system_write_wakeup_device(struct file *file,
                         }
                 }
         }
-        spin_unlock(&acpi_device_lock);
+        mutex_unlock(&acpi_device_lock);
         return count;
 }
 
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 4e6e758bd397..f7ca8c55956b 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -145,6 +145,9 @@ static void acpi_timer_check_state(int state, struct acpi_processor *pr,
         struct acpi_processor_power *pwr = &pr->power;
         u8 type = local_apic_timer_c2_ok ? ACPI_STATE_C3 : ACPI_STATE_C2;
 
+        if (cpu_has(&cpu_data(pr->id), X86_FEATURE_ARAT))
+                return;
+
         /*
          * Check, if one of the previous states already marked the lapic
          * unstable
@@ -578,6 +581,11 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
         for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
                 struct acpi_processor_cx *cx = &pr->power.states[i];
 
+#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
+                /* TSC could halt in idle, so notify users */
+                if (tsc_halts_in_c(cx->type))
+                        mark_tsc_unstable("TSC halts in idle");;
+#endif
                 switch (cx->type) {
                 case ACPI_STATE_C1:
                         cx->valid = 1;
@@ -654,11 +662,9 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
 
         seq_printf(seq, "active state:            C%zd\n"
                    "max_cstate:              C%d\n"
-                   "bus master activity:     %08x\n"
                    "maximum allowed latency: %d usec\n",
                    pr->power.state ? pr->power.state - pr->power.states : 0,
-                   max_cstate, (unsigned)pr->power.bm_activity,
-                   pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY));
+                   max_cstate, pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY));
 
         seq_puts(seq, "states:\n");
 
@@ -868,11 +874,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         kt2 = ktime_get_real();
         idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
 
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
-        /* TSC could halt in idle, so notify users */
-        if (tsc_halts_in_c(cx->type))
-                mark_tsc_unstable("TSC halts in idle");;
-#endif
         sleep_ticks = us_to_pm_timer_ticks(idle_time);
 
         /* Tell the scheduler how much we idled: */
@@ -952,6 +953,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
          */
         acpi_state_timer_broadcast(pr, cx, 1);
 
+        kt1 = ktime_get_real();
         /*
          * disable bus master
          * bm_check implies we need ARB_DIS
@@ -973,10 +975,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                 ACPI_FLUSH_CPU_CACHE();
         }
 
-        kt1 = ktime_get_real();
         acpi_idle_do_entry(cx);
-        kt2 = ktime_get_real();
-        idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
 
         /* Re-enable bus master arbitration */
         if (pr->flags.bm_check && pr->flags.bm_control) {
@@ -985,12 +984,9 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                 c3_cpu_count--;
                 spin_unlock(&c3_lock);
         }
+        kt2 = ktime_get_real();
+        idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
 
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
-        /* TSC could halt in idle, so notify users */
-        if (tsc_halts_in_c(ACPI_STATE_C3))
-                mark_tsc_unstable("TSC halts in idle");
-#endif
         sleep_ticks = us_to_pm_timer_ticks(idle_time);
         /* Tell the scheduler how much we idled: */
         sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
@@ -1034,6 +1030,9 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
                 dev->states[i].desc[0] = '\0';
         }
 
+        if (max_cstate == 0)
+                max_cstate = 1;
+
         for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) {
                 cx = &pr->power.states[i];
                 state = &dev->states[count];
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 20c23c049207..8ff510b91d88 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -24,7 +24,7 @@ extern struct acpi_device *acpi_root;
 
 static LIST_HEAD(acpi_device_list);
 static LIST_HEAD(acpi_bus_id_list);
-DEFINE_SPINLOCK(acpi_device_lock);
+DEFINE_MUTEX(acpi_device_lock);
 LIST_HEAD(acpi_wakeup_device_list);
 
 struct acpi_device_bus_id{
@@ -491,7 +491,6 @@ static int acpi_device_register(struct acpi_device *device,
          */
         INIT_LIST_HEAD(&device->children);
         INIT_LIST_HEAD(&device->node);
-        INIT_LIST_HEAD(&device->g_list);
         INIT_LIST_HEAD(&device->wakeup_list);
 
         new_bus_id = kzalloc(sizeof(struct acpi_device_bus_id), GFP_KERNEL);
@@ -500,7 +499,7 @@ static int acpi_device_register(struct acpi_device *device,
                 return -ENOMEM;
         }
 
-        spin_lock(&acpi_device_lock);
+        mutex_lock(&acpi_device_lock);
         /*
          * Find suitable bus_id and instance number in acpi_bus_id_list
          * If failed, create one and link it into acpi_bus_id_list
@@ -521,14 +520,12 @@ static int acpi_device_register(struct acpi_device *device,
         }
         dev_set_name(&device->dev, "%s:%02x", acpi_device_bus_id->bus_id, acpi_device_bus_id->instance_no);
 
-        if (device->parent) {
+        if (device->parent)
                 list_add_tail(&device->node, &device->parent->children);
-                list_add_tail(&device->g_list, &device->parent->g_list);
-        } else
-                list_add_tail(&device->g_list, &acpi_device_list);
+
         if (device->wakeup.flags.valid)
                 list_add_tail(&device->wakeup_list, &acpi_wakeup_device_list);
-        spin_unlock(&acpi_device_lock);
+        mutex_unlock(&acpi_device_lock);
 
         if (device->parent)
                 device->dev.parent = &parent->dev;
@@ -549,28 +546,22 @@ static int acpi_device_register(struct acpi_device *device,
         device->removal_type = ACPI_BUS_REMOVAL_NORMAL;
         return 0;
   end:
-        spin_lock(&acpi_device_lock);
-        if (device->parent) {
+        mutex_lock(&acpi_device_lock);
+        if (device->parent)
                 list_del(&device->node);
-                list_del(&device->g_list);
-        } else
-                list_del(&device->g_list);
         list_del(&device->wakeup_list);
-        spin_unlock(&acpi_device_lock);
+        mutex_unlock(&acpi_device_lock);
         return result;
 }
 
 static void acpi_device_unregister(struct acpi_device *device, int type)
 {
-        spin_lock(&acpi_device_lock);
-        if (device->parent) {
+        mutex_lock(&acpi_device_lock);
+        if (device->parent)
                 list_del(&device->node);
-                list_del(&device->g_list);
-        } else
-                list_del(&device->g_list);
 
         list_del(&device->wakeup_list);
-        spin_unlock(&acpi_device_lock);
+        mutex_unlock(&acpi_device_lock);
 
         acpi_detach_data(device->handle, acpi_bus_data_handler);
 
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 779e4e500df4..01574a066534 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -300,9 +300,9 @@ static int acpi_suspend_state_valid(suspend_state_t pm_state)
 static struct platform_suspend_ops acpi_suspend_ops = {
         .valid = acpi_suspend_state_valid,
         .begin = acpi_suspend_begin,
-        .prepare = acpi_pm_prepare,
+        .prepare_late = acpi_pm_prepare,
         .enter = acpi_suspend_enter,
-        .finish = acpi_pm_finish,
+        .wake = acpi_pm_finish,
         .end = acpi_pm_end,
 };
 
@@ -328,9 +328,9 @@ static int acpi_suspend_begin_old(suspend_state_t pm_state)
 static struct platform_suspend_ops acpi_suspend_ops_old = {
         .valid = acpi_suspend_state_valid,
         .begin = acpi_suspend_begin_old,
-        .prepare = acpi_pm_disable_gpes,
+        .prepare_late = acpi_pm_disable_gpes,
         .enter = acpi_suspend_enter,
-        .finish = acpi_pm_finish,
+        .wake = acpi_pm_finish,
         .end = acpi_pm_end,
         .recover = acpi_pm_finish,
 };
@@ -713,6 +713,32 @@ static void acpi_power_off(void)
         acpi_enter_sleep_state(ACPI_STATE_S5);
 }
 
+/*
+ * ACPI 2.0 created the optional _GTS and _BFS,
+ * but industry adoption has been neither rapid nor broad.
+ *
+ * Linux gets into trouble when it executes poorly validated
+ * paths through the BIOS, so disable _GTS and _BFS by default,
+ * but do speak up and offer the option to enable them.
+ */
+void __init acpi_gts_bfs_check(void)
+{
+        acpi_handle dummy;
+
+        if (ACPI_SUCCESS(acpi_get_handle(ACPI_ROOT_OBJECT, METHOD_NAME__GTS, &dummy)))
+        {
+                printk(KERN_NOTICE PREFIX "BIOS offers _GTS\n");
+                printk(KERN_NOTICE PREFIX "If \"acpi.gts=1\" improves suspend, "
+                        "please notify linux-acpi@vger.kernel.org\n");
+        }
+        if (ACPI_SUCCESS(acpi_get_handle(ACPI_ROOT_OBJECT, METHOD_NAME__BFS, &dummy)))
+        {
+                printk(KERN_NOTICE PREFIX "BIOS offers _BFS\n");
+                printk(KERN_NOTICE PREFIX "If \"acpi.bfs=1\" improves resume, "
+                        "please notify linux-acpi@vger.kernel.org\n");
+        }
+}
+
 int __init acpi_sleep_init(void)
 {
         acpi_status status;
@@ -771,5 +797,6 @@ int __init acpi_sleep_init(void)
          * object can also be evaluated when the system enters S5.
          */
         register_reboot_notifier(&tts_notifier);
+        acpi_gts_bfs_check();
         return 0;
 }
diff --git a/drivers/acpi/sleep.h b/drivers/acpi/sleep.h
index cfaf8f5b0a14..8a8f3b3382a6 100644
--- a/drivers/acpi/sleep.h
+++ b/drivers/acpi/sleep.h
@@ -5,3 +5,6 @@ extern int acpi_suspend (u32 state);
 extern void acpi_enable_wakeup_device_prep(u8 sleep_state);
 extern void acpi_enable_wakeup_device(u8 sleep_state);
 extern void acpi_disable_wakeup_device(u8 sleep_state);
+
+extern struct list_head acpi_wakeup_device_list;
+extern struct mutex acpi_device_lock;
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index da51f05ef8d8..0944daec064f 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -38,6 +38,7 @@ ACPI_MODULE_NAME("system");
 #define ACPI_SYSTEM_DEVICE_NAME         "System"
 
 u32 acpi_irq_handled;
+u32 acpi_irq_not_handled;
 
 /*
  * Make ACPICA version work as module param
@@ -214,8 +215,9 @@ err:
 
 #define COUNT_GPE 0
 #define COUNT_SCI 1     /* acpi_irq_handled */
-#define COUNT_ERROR 2   /* other */
-#define NUM_COUNTERS_EXTRA 3
+#define COUNT_SCI_NOT 2 /* acpi_irq_not_handled */
+#define COUNT_ERROR 3   /* other */
+#define NUM_COUNTERS_EXTRA 4
 
 struct event_counter {
         u32 count;
@@ -317,6 +319,8 @@ static ssize_t counter_show(struct kobject *kobj,
 
         all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI].count =
                 acpi_irq_handled;
+        all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI_NOT].count =
+                acpi_irq_not_handled;
         all_counters[num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_GPE].count =
                 acpi_gpe_count;
 
@@ -363,6 +367,7 @@ static ssize_t counter_set(struct kobject *kobj,
                         all_counters[i].count = 0;
                 acpi_gpe_count = 0;
                 acpi_irq_handled = 0;
+                acpi_irq_not_handled = 0;
                 goto end;
         }
 
@@ -456,6 +461,8 @@ void acpi_irq_stats_init(void)
                         sprintf(buffer, "gpe_all");
                 else if (i == num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI)
                         sprintf(buffer, "sci");
+                else if (i == num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_SCI_NOT)
+                        sprintf(buffer, "sci_not");
                 else if (i == num_gpes + ACPI_NUM_FIXED_EVENTS + COUNT_ERROR)
                         sprintf(buffer, "error");
                 else
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index e8c143caf0fd..564ea1424288 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -98,6 +98,7 @@ MODULE_PARM_DESC(psv, "Disable or override all passive trip points.");
 static int acpi_thermal_add(struct acpi_device *device);
 static int acpi_thermal_remove(struct acpi_device *device, int type);
 static int acpi_thermal_resume(struct acpi_device *device);
+static void acpi_thermal_notify(struct acpi_device *device, u32 event);
 static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file);
 static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file);
 static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file);
@@ -123,6 +124,7 @@ static struct acpi_driver acpi_thermal_driver = {
                 .add = acpi_thermal_add,
                 .remove = acpi_thermal_remove,
                 .resume = acpi_thermal_resume,
+                .notify = acpi_thermal_notify,
                 },
 };
 
@@ -192,6 +194,7 @@ struct acpi_thermal {
         struct acpi_handle_list devices;
         struct thermal_zone_device *thermal_zone;
         int tz_enabled;
+        int kelvin_offset;
         struct mutex lock;
 };
 
@@ -581,7 +584,7 @@ static void acpi_thermal_check(void *data)
 }
 
 /* sys I/F for generic thermal sysfs support */
-#define KELVIN_TO_MILLICELSIUS(t) (t * 100 - 273200)
+#define KELVIN_TO_MILLICELSIUS(t, off) (((t) - (off)) * 100)
 
 static int thermal_get_temp(struct thermal_zone_device *thermal,
                             unsigned long *temp)
@@ -596,7 +599,7 @@ static int thermal_get_temp(struct thermal_zone_device *thermal,
         if (result)
                 return result;
 
-        *temp = KELVIN_TO_MILLICELSIUS(tz->temperature);
+        *temp = KELVIN_TO_MILLICELSIUS(tz->temperature, tz->kelvin_offset);
         return 0;
 }
 
@@ -702,7 +705,8 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
         if (tz->trips.critical.flags.valid) {
                 if (!trip) {
                         *temp = KELVIN_TO_MILLICELSIUS(
-                                tz->trips.critical.temperature);
+                                tz->trips.critical.temperature,
+                                tz->kelvin_offset);
                         return 0;
                 }
                 trip--;
@@ -711,7 +715,8 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
         if (tz->trips.hot.flags.valid) {
                 if (!trip) {
                         *temp = KELVIN_TO_MILLICELSIUS(
-                                tz->trips.hot.temperature);
+                                tz->trips.hot.temperature,
+                                tz->kelvin_offset);
                         return 0;
                 }
                 trip--;
@@ -720,7 +725,8 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
         if (tz->trips.passive.flags.valid) {
                 if (!trip) {
                         *temp = KELVIN_TO_MILLICELSIUS(
-                                tz->trips.passive.temperature);
+                                tz->trips.passive.temperature,
+                                tz->kelvin_offset);
                         return 0;
                 }
                 trip--;
@@ -730,7 +736,8 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
                 tz->trips.active[i].flags.valid; i++) {
                 if (!trip) {
                         *temp = KELVIN_TO_MILLICELSIUS(
-                                tz->trips.active[i].temperature);
+                                tz->trips.active[i].temperature,
+                                tz->kelvin_offset);
                         return 0;
                 }
                 trip--;
@@ -745,7 +752,8 @@ static int thermal_get_crit_temp(struct thermal_zone_device *thermal,
 
         if (tz->trips.critical.flags.valid) {
                 *temperature = KELVIN_TO_MILLICELSIUS(
-                                tz->trips.critical.temperature);
+                                tz->trips.critical.temperature,
+                                tz->kelvin_offset);
                 return 0;
         } else
                 return -EINVAL;
@@ -901,7 +909,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
                         thermal_zone_device_register("acpitz", trips, tz,
                                                      &acpi_thermal_zone_ops,
                                                      0, 0, 0,
-                                                     tz->polling_frequency);
+                                                     tz->polling_frequency*100);
         if (IS_ERR(tz->thermal_zone))
                 return -ENODEV;
 
@@ -1264,17 +1272,14 @@ static int acpi_thermal_remove_fs(struct acpi_device *device)
                                  Driver Interface
    -------------------------------------------------------------------------- */
 
-static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)
+static void acpi_thermal_notify(struct acpi_device *device, u32 event)
 {
-        struct acpi_thermal *tz = data;
-        struct acpi_device *device = NULL;
+        struct acpi_thermal *tz = acpi_driver_data(device);
 
 
         if (!tz)
                 return;
 
-        device = tz->device;
-
         switch (event) {
         case ACPI_THERMAL_NOTIFY_TEMPERATURE:
                 acpi_thermal_check(tz);
@@ -1298,8 +1303,6 @@ static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)
                                   "Unsupported event [0x%x]\n", event));
                 break;
         }
-
-        return;
 }
 
 static int acpi_thermal_get_info(struct acpi_thermal *tz)
@@ -1334,10 +1337,28 @@ static int acpi_thermal_get_info(struct acpi_thermal *tz)
         return 0;
 }
 
+/*
+ * The exact offset between Kelvin and degree Celsius is 273.15. However ACPI
+ * handles temperature values with a single decimal place. As a consequence,
+ * some implementations use an offset of 273.1 and others use an offset of
+ * 273.2. Try to find out which one is being used, to present the most
+ * accurate and visually appealing number.
+ *
+ * The heuristic below should work for all ACPI thermal zones which have a
+ * critical trip point with a value being a multiple of 0.5 degree Celsius.
+ */
+static void acpi_thermal_guess_offset(struct acpi_thermal *tz)
+{
+        if (tz->trips.critical.flags.valid &&
+            (tz->trips.critical.temperature % 5) == 1)
+                tz->kelvin_offset = 2731;
+        else
+                tz->kelvin_offset = 2732;
+}
+
 static int acpi_thermal_add(struct acpi_device *device)
 {
         int result = 0;
-        acpi_status status = AE_OK;
         struct acpi_thermal *tz = NULL;
 
 
@@ -1360,6 +1381,8 @@ static int acpi_thermal_add(struct acpi_device *device)
         if (result)
                 goto free_memory;
 
+        acpi_thermal_guess_offset(tz);
+
         result = acpi_thermal_register_thermal_zone(tz);
         if (result)
                 goto free_memory;
@@ -1368,21 +1391,11 @@ static int acpi_thermal_add(struct acpi_device *device)
         if (result)
                 goto unregister_thermal_zone;
 
-        status = acpi_install_notify_handler(device->handle,
-                                             ACPI_DEVICE_NOTIFY,
-                                             acpi_thermal_notify, tz);
-        if (ACPI_FAILURE(status)) {
-                result = -ENODEV;
-                goto remove_fs;
-        }
-
         printk(KERN_INFO PREFIX "%s [%s] (%ld C)\n",
                acpi_device_name(device), acpi_device_bid(device),
                KELVIN_TO_CELSIUS(tz->temperature));
         goto end;
 
-remove_fs:
-        acpi_thermal_remove_fs(device);
 unregister_thermal_zone:
         thermal_zone_device_unregister(tz->thermal_zone);
 free_memory:
@@ -1393,7 +1406,6 @@ end:
 
 static int acpi_thermal_remove(struct acpi_device *device, int type)
 {
-        acpi_status status = AE_OK;
         struct acpi_thermal *tz = NULL;
 
         if (!device || !acpi_driver_data(device))
@@ -1401,10 +1413,6 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)
 
         tz = acpi_driver_data(device);
 
-        status = acpi_remove_notify_handler(device->handle,
-                                            ACPI_DEVICE_NOTIFY,
-                                            acpi_thermal_notify);
-
         acpi_thermal_remove_fs(device);
         acpi_thermal_unregister_thermal_zone(tz);
         mutex_destroy(&tz->lock);
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index ab06143672bc..1705d947ea09 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -79,6 +79,7 @@ module_param(brightness_switch_enabled, bool, 0644);
 static int acpi_video_bus_add(struct acpi_device *device);
 static int acpi_video_bus_remove(struct acpi_device *device, int type);
 static int acpi_video_resume(struct acpi_device *device);
+static void acpi_video_bus_notify(struct acpi_device *device, u32 event);
 
 static const struct acpi_device_id video_device_ids[] = {
         {ACPI_VIDEO_HID, 0},
@@ -94,6 +95,7 @@ static struct acpi_driver acpi_video_bus = {
                 .add = acpi_video_bus_add,
                 .remove = acpi_video_bus_remove,
                 .resume = acpi_video_resume,
+                .notify = acpi_video_bus_notify,
                 },
 };
 
@@ -768,10 +770,12 @@ acpi_video_init_brightness(struct acpi_video_device *device)
          * In this case, the first two elements in _BCL packages
          * are also supported brightness levels that OS should take care of.
          */
-        for (i = 2; i < count; i++)
-                if (br->levels[i] == br->levels[0] ||
-                    br->levels[i] == br->levels[1])
+        for (i = 2; i < count; i++) {
+                if (br->levels[i] == br->levels[0])
                         level_ac_battery++;
+                if (br->levels[i] == br->levels[1])
+                        level_ac_battery++;
+        }
 
         if (level_ac_battery < 2) {
                 level_ac_battery = 2 - level_ac_battery;
@@ -805,12 +809,19 @@ acpi_video_init_brightness(struct acpi_video_device *device)
         br->flags._BCM_use_index = br->flags._BCL_use_index;
 
         /* _BQC uses INDEX while _BCL uses VALUE in some laptops */
-        br->curr = max_level;
+        br->curr = level_old = max_level;
+
+        if (!device->cap._BQC)
+                goto set_level;
+
         result = acpi_video_device_lcd_get_level_current(device, &level_old);
         if (result)
                 goto out_free_levels;
 
-        result = acpi_video_device_lcd_set_level(device, br->curr);
+        /*
+         * Set the level to maximum and check if _BQC uses indexed value
+         */
+        result = acpi_video_device_lcd_set_level(device, max_level);
         if (result)
                 goto out_free_levels;
 
@@ -818,25 +829,19 @@ acpi_video_init_brightness(struct acpi_video_device *device)
         if (result)
                 goto out_free_levels;
 
-        if ((level != level_old) && !br->flags._BCM_use_index) {
-                /* Note:
-                 * This piece of code does not work correctly if the current
-                 * brightness levels is 0.
-                 * But I guess boxes that boot with such a dark screen are rare
-                 * and no more code is needed to cover this specifial case.
-                 */
-
-                if (level_ac_battery != 2) {
-                        /*
-                         * For now, we don't support the _BCL like this:
-                         * 16, 15, 0, 1, 2, 3, ..., 14, 15, 16
-                         * because we may mess up the index returned by _BQC.
-                         * Plus: we have not got a box like this.
-                         */
-                        ACPI_ERROR((AE_INFO, "_BCL not supported\n"));
-                }
-                br->flags._BQC_use_index = 1;
-        }
+        br->flags._BQC_use_index = (level == max_level ? 0 : 1);
+
+        if (!br->flags._BQC_use_index)
+                goto set_level;
+
+        if (br->flags._BCL_reversed)
+                level_old = (br->count - 1) - level_old;
+        level_old = br->levels[level_old];
+
+set_level:
+        result = acpi_video_device_lcd_set_level(device, level_old);
+        if (result)
+                goto out_free_levels;
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                           "found %d brightness levels\n", count - 2));
@@ -1986,17 +1991,15 @@ static int acpi_video_bus_stop_devices(struct acpi_video_bus *video)
         return acpi_video_bus_DOS(video, 0, 1);
 }
 
-static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
+static void acpi_video_bus_notify(struct acpi_device *device, u32 event)
 {
-        struct acpi_video_bus *video = data;
-        struct acpi_device *device = NULL;
+        struct acpi_video_bus *video = acpi_driver_data(device);
         struct input_dev *input;
         int keycode;
 
         if (!video)
                 return;
 
-        device = video->device;
         input = video->input;
 
         switch (event) {
@@ -2127,7 +2130,6 @@ static int acpi_video_resume(struct acpi_device *device)
 
 static int acpi_video_bus_add(struct acpi_device *device)
 {
-        acpi_status status;
         struct acpi_video_bus *video;
         struct input_dev *input;
         int error;
@@ -2169,20 +2171,10 @@ static int acpi_video_bus_add(struct acpi_device *device)
         acpi_video_bus_get_devices(video, device);
         acpi_video_bus_start_devices(video);
 
-        status = acpi_install_notify_handler(device->handle,
-                                             ACPI_DEVICE_NOTIFY,
-                                             acpi_video_bus_notify, video);
-        if (ACPI_FAILURE(status)) {
-                printk(KERN_ERR PREFIX
-                                  "Error installing notify handler\n");
-                error = -ENODEV;
-                goto err_stop_video;
-        }
-
         video->input = input = input_allocate_device();
         if (!input) {
                 error = -ENOMEM;
-                goto err_uninstall_notify;
+                goto err_stop_video;
         }
 
         snprintf(video->phys, sizeof(video->phys),
@@ -2218,9 +2210,6 @@ static int acpi_video_bus_add(struct acpi_device *device)
 
  err_free_input_dev:
         input_free_device(input);
- err_uninstall_notify:
-        acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
-                                   acpi_video_bus_notify);
  err_stop_video:
         acpi_video_bus_stop_devices(video);
         acpi_video_bus_put_devices(video);
@@ -2235,7 +2224,6 @@ static int acpi_video_bus_add(struct acpi_device *device)
 
 static int acpi_video_bus_remove(struct acpi_device *device, int type)
 {
-        acpi_status status = 0;
         struct acpi_video_bus *video = NULL;
 
 
@@ -2245,11 +2233,6 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)
         video = acpi_driver_data(device);
 
         acpi_video_bus_stop_devices(video);
-
-        status = acpi_remove_notify_handler(video->device->handle,
-                                            ACPI_DEVICE_NOTIFY,
-                                            acpi_video_bus_notify);
-
         acpi_video_bus_put_devices(video);
         acpi_video_bus_remove_fs(device);
 
diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c
index 5aee8c26cc9f..88725dcdf8bc 100644
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@ -12,12 +12,14 @@
 #include "internal.h"
 #include "sleep.h"
 
+/*
+ * We didn't lock acpi_device_lock in the file, because it invokes oops in
+ * suspend/resume and isn't really required as this is called in S-state. At
+ * that time, there is no device hotplug
+ **/
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("wakeup_devices")
 
-extern struct list_head acpi_wakeup_device_list;
-extern spinlock_t acpi_device_lock;
-
 /**
  * acpi_enable_wakeup_device_prep - prepare wakeup devices
  *      @sleep_state:   ACPI state
@@ -29,7 +31,6 @@ void acpi_enable_wakeup_device_prep(u8 sleep_state)
 {
         struct list_head *node, *next;
 
-        spin_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                 struct acpi_device *dev = container_of(node,
                                                        struct acpi_device,
@@ -40,11 +41,8 @@ void acpi_enable_wakeup_device_prep(u8 sleep_state)
                     (sleep_state > (u32) dev->wakeup.sleep_state))
                         continue;
 
-                spin_unlock(&acpi_device_lock);
                 acpi_enable_wakeup_device_power(dev, sleep_state);
-                spin_lock(&acpi_device_lock);
         }
-        spin_unlock(&acpi_device_lock);
 }
 
 /**
@@ -60,7 +58,6 @@ void acpi_enable_wakeup_device(u8 sleep_state)
          * Caution: this routine must be invoked when interrupt is disabled 
          * Refer ACPI2.0: P212
          */
-        spin_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                 struct acpi_device *dev =
                         container_of(node, struct acpi_device, wakeup_list);
@@ -74,22 +71,17 @@ void acpi_enable_wakeup_device(u8 sleep_state)
                 if ((!dev->wakeup.state.enabled && !dev->wakeup.flags.prepared)
                     || sleep_state > (u32) dev->wakeup.sleep_state) {
                         if (dev->wakeup.flags.run_wake) {
-                                spin_unlock(&acpi_device_lock);
                                 /* set_gpe_type will disable GPE, leave it like that */
                                 acpi_set_gpe_type(dev->wakeup.gpe_device,
                                                   dev->wakeup.gpe_number,
                                                   ACPI_GPE_TYPE_RUNTIME);
-                                spin_lock(&acpi_device_lock);
                         }
                         continue;
                 }
-                spin_unlock(&acpi_device_lock);
                 if (!dev->wakeup.flags.run_wake)
                         acpi_enable_gpe(dev->wakeup.gpe_device,
                                         dev->wakeup.gpe_number);
-                spin_lock(&acpi_device_lock);
         }
-        spin_unlock(&acpi_device_lock);
 }
 
 /**
@@ -101,7 +93,6 @@ void acpi_disable_wakeup_device(u8 sleep_state)
 {
         struct list_head *node, *next;
 
-        spin_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                 struct acpi_device *dev =
                         container_of(node, struct acpi_device, wakeup_list);
@@ -112,19 +103,16 @@ void acpi_disable_wakeup_device(u8 sleep_state)
                 if ((!dev->wakeup.state.enabled && !dev->wakeup.flags.prepared)
                     || sleep_state > (u32) dev->wakeup.sleep_state) {
                         if (dev->wakeup.flags.run_wake) {
-                                spin_unlock(&acpi_device_lock);
                                 acpi_set_gpe_type(dev->wakeup.gpe_device,
                                                   dev->wakeup.gpe_number,
                                                   ACPI_GPE_TYPE_WAKE_RUN);
                                 /* Re-enable it, since set_gpe_type will disable it */
                                 acpi_enable_gpe(dev->wakeup.gpe_device,
                                                 dev->wakeup.gpe_number);
-                                spin_lock(&acpi_device_lock);
                         }
                         continue;
                 }
 
-                spin_unlock(&acpi_device_lock);
                 acpi_disable_wakeup_device_power(dev);
                 /* Never disable run-wake GPE */
                 if (!dev->wakeup.flags.run_wake) {
@@ -133,16 +121,14 @@ void acpi_disable_wakeup_device(u8 sleep_state)
                         acpi_clear_gpe(dev->wakeup.gpe_device,
                                        dev->wakeup.gpe_number, ACPI_NOT_ISR);
                 }
-                spin_lock(&acpi_device_lock);
         }
-        spin_unlock(&acpi_device_lock);
 }
 
 int __init acpi_wakeup_device_init(void)
 {
         struct list_head *node, *next;
 
-        spin_lock(&acpi_device_lock);
+        mutex_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                 struct acpi_device *dev = container_of(node,
                                                        struct acpi_device,
@@ -150,15 +136,13 @@ int __init acpi_wakeup_device_init(void)
                 /* In case user doesn't load button driver */
                 if (!dev->wakeup.flags.run_wake || dev->wakeup.state.enabled)
                         continue;
-                spin_unlock(&acpi_device_lock);
                 acpi_set_gpe_type(dev->wakeup.gpe_device,
                                   dev->wakeup.gpe_number,
                                   ACPI_GPE_TYPE_WAKE_RUN);
                 acpi_enable_gpe(dev->wakeup.gpe_device,
                                 dev->wakeup.gpe_number);
                 dev->wakeup.state.enabled = 1;
-                spin_lock(&acpi_device_lock);
         }
-        spin_unlock(&acpi_device_lock);
+        mutex_unlock(&acpi_device_lock);
         return 0;
 }