diff options
| author | Simon Kirby <sim@hostway.ca> | 2011-09-22 17:03:46 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-09-26 12:51:08 +0200 |
| commit | 6ebbe7a07b3bc40b168d2afc569a6543c020d2e3 (patch) | |
| tree | 5fa7eb4d48796af7aede4f7c0b92fde4047deeaa /kernel | |
| parent | 3be209a8e22cedafc1b6945608b7bb8d9887ab61 (diff) | |
| download | linux-6ebbe7a07b3bc40b168d2afc569a6543c020d2e3.tar.bz2 | |
sched: Fix up wchan borkage
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index ec5f472bc5b9..d249ea88428c 100644 --- a/kernel/sched.c +++ b/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; |