1 files changed, 11 insertions, 49 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 78418ce4fc78..f14d3f251d26 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -191,36 +191,11 @@ acpi_status __init acpi_os_initialize(void)
         return AE_OK;
 }
 
-static void bind_to_cpu0(struct work_struct *work)
-{
-        set_cpus_allowed_ptr(current, cpumask_of(0));
-        kfree(work);
-}
-
-static void bind_workqueue(struct workqueue_struct *wq)
-{
-        struct work_struct *work;
-
-        work = kzalloc(sizeof(struct work_struct), GFP_KERNEL);
-        INIT_WORK(work, bind_to_cpu0);
-        queue_work(wq, work);
-}
-
 acpi_status acpi_os_initialize1(void)
 {
-        /*
-         * On some machines, a software-initiated SMI causes corruption unless
-         * the SMI runs on CPU 0.  An SMI can be initiated by any AML, but
-         * typically it's done in GPE-related methods that are run via
-         * workqueues, so we can avoid the known corruption cases by binding
-         * the workqueues to CPU 0.
-         */
-        kacpid_wq = create_singlethread_workqueue("kacpid");
-        bind_workqueue(kacpid_wq);
-        kacpi_notify_wq = create_singlethread_workqueue("kacpi_notify");
-        bind_workqueue(kacpi_notify_wq);
-        kacpi_hotplug_wq = create_singlethread_workqueue("kacpi_hotplug");
-        bind_workqueue(kacpi_hotplug_wq);
+        kacpid_wq = create_workqueue("kacpid");
+        kacpi_notify_wq = create_workqueue("kacpi_notify");
+        kacpi_hotplug_wq = create_workqueue("kacpi_hotplug");
         BUG_ON(!kacpid_wq);
         BUG_ON(!kacpi_notify_wq);
         BUG_ON(!kacpi_hotplug_wq);
@@ -766,7 +741,14 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
         else
                 INIT_WORK(&dpc->work, acpi_os_execute_deferred);
 
-        ret = queue_work(queue, &dpc->work);
+        /*
+         * On some machines, a software-initiated SMI causes corruption unless
+         * the SMI runs on CPU 0.  An SMI can be initiated by any AML, but
+         * typically it's done in GPE-related methods that are run via
+         * workqueues, so we can avoid the known corruption cases by always
+         * queueing on CPU 0.
+         */
+        ret = queue_work_on(0, queue, &dpc->work);
 
         if (!ret) {
                 printk(KERN_ERR PREFIX
@@ -1064,26 +1046,6 @@ static int __init acpi_serialize_setup(char *str)
 
 __setup("acpi_serialize", acpi_serialize_setup);
 
-/*
- * Wake and Run-Time GPES are expected to be separate.
- * We disable wake-GPEs at run-time to prevent spurious
- * interrupts.
- *
- * However, if a system exists that shares Wake and
- * Run-time events on the same GPE this flag is available
- * to tell Linux to keep the wake-time GPEs enabled at run-time.
- */
-static int __init acpi_wake_gpes_always_on_setup(char *str)
-{
-        printk(KERN_INFO PREFIX "wake GPEs not disabled\n");
-
-        acpi_gbl_leave_wake_gpes_disabled = FALSE;
-
-        return 1;
-}
-
-__setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);
-
 /* Check of resource interference between native drivers and ACPI
  * OperationRegions (SystemIO and System Memory only).
  * IO ports and memory declared in ACPI might be used by the ACPI subsystem