Merge tag 'v3.18-rc1' into v4l_for_linus

[firefly-linux-kernel-4.4.55.git] / drivers / parisc / power.c

diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 6dedbdef7106518ba583eb72bd81f70bd130bb6e..ef31b77404ef8e1113010805cbcbe46b71f1ff0f 100644 (file)
--- a/drivers/parisc/power.c
+++ b/drivers/parisc/power.c
@@ -41,6 +41,7 @@
 #include <linux/reboot.h>
 #include <linux/sched.h>
 #include <linux/kthread.h>
+#include <linux/pm.h>
 
 #include <asm/pdc.h>
 #include <asm/io.h>
@@ -120,7 +121,6 @@ static int kpowerswd(void *param)
                unsigned long soft_power_reg = (unsigned long) param;
 
                schedule_timeout_interruptible(pwrsw_enabled ? HZ : HZ/POWERSWITCH_POLL_PER_SEC);
-               __set_current_state(TASK_RUNNING);
 
                if (unlikely(!pwrsw_enabled))
                        continue;