]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
sched: Fix up wchan borkage
authorSimon Kirby <sim@hostway.ca>
Fri, 23 Sep 2011 00:03:46 +0000 (17:03 -0700)
committerIngo Molnar <mingo@elte.hu>
Mon, 26 Sep 2011 10:51:08 +0000 (12:51 +0200)
Commit c259e01a1ec ("sched: Separate the scheduler entry for
preemption") contained a boo-boo wrecking wchan output. It forgot to
put the new schedule() function in the __sched section and thereby
doesn't get properly ignored for things like wchan.

Tested-by: Simon Kirby <sim@hostway.ca>
Cc: stable@kernel.org # 2.6.39+
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20110923000346.GA25425@hostway.ca
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/sched.c

index ec5f472bc5b9cec2a5c43ab7f8a054ecca75b39a..d249ea88428cca61c9ee29d6e5533fdcd1911411 100644 (file)
@@ -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;