From 8a5bec0c37ff3a46aba333d2bb9367ac310f3067 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Wed, 5 Jan 2011 12:50:16 +1100
Subject: [PATCH] --- yaml --- r: 224016 b: refs/heads/master c:
 6bf4123760a5aece6e4829ce90b70b6ffd751d65 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/completion.h | 8 ++++----
 trunk/kernel/sched.c             | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c9cda9e477d3..a8305549b998 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27066fd484a32c80630136aa2b91c980f3198f9d
+refs/heads/master: 6bf4123760a5aece6e4829ce90b70b6ffd751d65
diff --git a/trunk/include/linux/completion.h b/trunk/include/linux/completion.h
index 36d57f74cd01..51494e6b5548 100644
--- a/trunk/include/linux/completion.h
+++ b/trunk/include/linux/completion.h
@@ -81,10 +81,10 @@ extern int wait_for_completion_interruptible(struct completion *x);
 extern int wait_for_completion_killable(struct completion *x);
 extern unsigned long wait_for_completion_timeout(struct completion *x,
 						   unsigned long timeout);
-extern unsigned long wait_for_completion_interruptible_timeout(
-			struct completion *x, unsigned long timeout);
-extern unsigned long wait_for_completion_killable_timeout(
-			struct completion *x, unsigned long timeout);
+extern long wait_for_completion_interruptible_timeout(
+	struct completion *x, unsigned long timeout);
+extern long wait_for_completion_killable_timeout(
+	struct completion *x, unsigned long timeout);
 extern bool try_wait_for_completion(struct completion *x);
 extern bool completion_done(struct completion *x);
 
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index f2f914e0c47c..114a0deb2b01 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -4395,7 +4395,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
  * This waits for either a completion of a specific task to be signaled or for a
  * specified timeout to expire. It is interruptible. The timeout is in jiffies.
  */
-unsigned long __sched
+long __sched
 wait_for_completion_interruptible_timeout(struct completion *x,
 					  unsigned long timeout)
 {
@@ -4428,7 +4428,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
  * signaled or for a specified timeout to expire. It can be
  * interrupted by a kill signal. The timeout is in jiffies.
  */
-unsigned long __sched
+long __sched
 wait_for_completion_killable_timeout(struct completion *x,
 				     unsigned long timeout)
 {