From 5e97d510e3e9ee29810c036450dad60399525b3a Mon Sep 17 00:00:00 2001
From: Simon Kirby <sim@hostway.ca>
Date: Thu, 22 Sep 2011 17:03:46 -0700
Subject: [PATCH] --- yaml --- r: 264212 b: refs/heads/master c:
 6ebbe7a07b3bc40b168d2afc569a6543c020d2e3 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;