Merge branch 'linus' into release

Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 8 insertions, 8 deletions

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;
 }