summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorSimon Kirby <sim@hostway.ca>2011-09-22 17:03:46 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-16 14:14:51 -0700
commit4e41ce698822a9a2cfd324a11ea44f60fc95c871 (patch)
treed2a7be264f9b5d631dcc7f26091d1f46e40ef565 /kernel
parent113f8b8f997cd3a70e6e4c95ced9232d50b7a308 (diff)
sched: Fix up wchan borkage
commit 6ebbe7a07b3bc40b168d2afc569a6543c020d2e3 upstream. 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> 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 8b3736076ac6..6202e924c963 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4335,7 +4335,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;