3.1-rc6: wchan not working

Without changing .config, /proc/x/wchan seems to now print "schedule" for everything; eg, with 0x.ca/sim/ref/3.1-rc6-blue/config-3.1.0-rc6-blue+ as the .config. I'm currently bisecting a few other regressions as well, but will add this to the list, unless it's obvious to anyone...

Simon-

Probably introduced by c259e01a1ec90063042f758e409cd26b2a0963c8

This patch from Peter (who should probably sign off on it) seems to work:

index ec5f472..d249ea8 100644
@@ -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;
 

Simon-