diff --git a/[refs] b/[refs] index 05341082ef71..cb119917830b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3be209a8e22cedafc1b6945608b7bb8d9887ab61 +refs/heads/master: 6ebbe7a07b3bc40b168d2afc569a6543c020d2e3 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index ec5f472bc5b9..d249ea88428c 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -4372,7 +4372,7 @@ static inline void sched_submit_work(struct task_struct *tsk) blk_schedule_flush_plug(tsk); } -asmlinkage void schedule(void) +asmlinkage void __sched schedule(void) { struct task_struct *tsk = current;