Merge tag 'jfs-5.14' of git://github.com/kleikamp/linux-shaggy

[linux-2.6-microblaze.git] / kernel / time / timer.c

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index d111adf..467087d 100644 (file)
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1879,7 +1879,7 @@ signed long __sched schedule_timeout(signed long timeout)
                        printk(KERN_ERR "schedule_timeout: wrong timeout "
                                "value %lx\n", timeout);
                        dump_stack();
-                       current->state = TASK_RUNNING;
+                       __set_current_state(TASK_RUNNING);
                        goto out;
                }
        }