Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
	arch/powerpc/kernel/Makefile
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/hardirq.h
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/irq.c
	arch/x86/kernel/syscall_table_32.S
	arch/x86/mm/iomap_32.c
	include/linux/sched.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 24 insertions, 15 deletions

diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 2834846a185d..9a3a682c6981 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -83,7 +83,6 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)
         acpi_handle handle = dev->data;
         struct acpi_buffer buffer;
         int ret;
-        acpi_status status;
 
         pnp_dbg(&dev->dev, "set resources\n");
         ret = pnpacpi_build_resource_template(dev, &buffer);
@@ -94,21 +93,31 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)
                 kfree(buffer.pointer);
                 return ret;
         }
-        status = acpi_set_current_resources(handle, &buffer);
-        if (ACPI_FAILURE(status))
+        if (ACPI_FAILURE(acpi_set_current_resources(handle, &buffer)))
                 ret = -EINVAL;
+        else if (acpi_bus_power_manageable(handle))
+                ret = acpi_bus_set_power(handle, ACPI_STATE_D0);
         kfree(buffer.pointer);
         return ret;
 }
 
 static int pnpacpi_disable_resources(struct pnp_dev *dev)
 {
-        acpi_status status;
+        acpi_handle handle = dev->data;
+        int ret;
+
+        dev_dbg(&dev->dev, "disable resources\n");
 
         /* acpi_unregister_gsi(pnp_irq(dev, 0)); */
-        status = acpi_evaluate_object((acpi_handle) dev->data,
-                                      "_DIS", NULL, NULL);
-        return ACPI_FAILURE(status) ? -ENODEV : 0;
+        ret = 0;
+        if (acpi_bus_power_manageable(handle)) {
+                ret = acpi_bus_set_power(handle, ACPI_STATE_D3);
+                if (ret)
+                        return ret;
+        }
+        if (ACPI_FAILURE(acpi_evaluate_object(handle, "_DIS", NULL, NULL)))
+                ret = -ENODEV;
+        return ret;
 }
 
 #ifdef CONFIG_ACPI_SLEEP
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 996f64838079..cfe86853feb2 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -94,7 +94,6 @@ struct pnp_dev_node_info node_info;
 
 #ifdef CONFIG_HOTPLUG
 
-static int unloading = 0;
 static struct completion unload_sem;
 
 /*
@@ -158,7 +157,7 @@ static int pnp_dock_thread(void *unused)
         int docked = -1, d = 0;
 
         set_freezable();
-        while (!unloading) {
+        while (1) {
                 int status;
 
                 /*
@@ -575,8 +574,6 @@ fs_initcall(pnpbios_init);
 
 static int __init pnpbios_thread_init(void)
 {
-        struct task_struct *task;
-
 #if defined(CONFIG_PPC)
         if (check_legacy_ioport(PNPBIOS_BASE))
                 return 0;
@@ -584,10 +581,13 @@ static int __init pnpbios_thread_init(void)
         if (pnpbios_disabled)
                 return 0;
 #ifdef CONFIG_HOTPLUG
-        init_completion(&unload_sem);
-        task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");
-        if (!IS_ERR(task))
-                unloading = 0;
+        {
+                struct task_struct *task;
+                init_completion(&unload_sem);
+                task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");
+                if (IS_ERR(task))
+                        return PTR_ERR(task);
+        }
 #endif
         return 0;
 }