From c627d725c4f062cf6f6eca036dea6a1eb8fe2e9b Mon Sep 17 00:00:00 2001
From: Livio Soares <livio@eecg.toronto.edu>
Date: Tue, 18 Dec 2007 15:21:13 +0100
Subject: [PATCH] --- yaml --- r: 75055 b: refs/heads/master c:
 c7af77b584b02d3e321b00203a618a9c93782121 h: refs/heads/master i:   75053:
 f822da558e9af345f838fd1ffb21443905299506   75051:
 4283801861452908de7e6d0efb559cef600604f3   75047:
 1093de169859b3faf84cbb381ec076f6576a3723   75039:
 579eee4f1f5e99d724462427df26ba8349b31353 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/rwsem.c | 5 +++--
 trunk/lib/rwsem.c    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f5d75e2218fa..103a85e8c102 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 051a1d1afa47206e23ae03f781c6795ce870e3d5
+refs/heads/master: c7af77b584b02d3e321b00203a618a9c93782121
diff --git a/trunk/kernel/rwsem.c b/trunk/kernel/rwsem.c
index 1ec620c03064..cae050b05f5e 100644
--- a/trunk/kernel/rwsem.c
+++ b/trunk/kernel/rwsem.c
@@ -6,6 +6,7 @@
 
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/sched.h>
 #include <linux/module.h>
 #include <linux/rwsem.h>
 
@@ -15,7 +16,7 @@
 /*
  * lock for reading
  */
-void down_read(struct rw_semaphore *sem)
+void __sched down_read(struct rw_semaphore *sem)
 {
 	might_sleep();
 	rwsem_acquire_read(&sem->dep_map, 0, 0, _RET_IP_);
@@ -42,7 +43,7 @@ EXPORT_SYMBOL(down_read_trylock);
 /*
  * lock for writing
  */
-void down_write(struct rw_semaphore *sem)
+void __sched down_write(struct rw_semaphore *sem)
 {
 	might_sleep();
 	rwsem_acquire(&sem->dep_map, 0, 0, _RET_IP_);
diff --git a/trunk/lib/rwsem.c b/trunk/lib/rwsem.c
index cdb4e3d05607..7d02700a4b0e 100644
--- a/trunk/lib/rwsem.c
+++ b/trunk/lib/rwsem.c
@@ -146,7 +146,7 @@ __rwsem_do_wake(struct rw_semaphore *sem, int downgrading)
 /*
  * wait for a lock to be granted
  */
-static struct rw_semaphore *
+static struct rw_semaphore __sched *
 rwsem_down_failed_common(struct rw_semaphore *sem,
 			struct rwsem_waiter *waiter, signed long adjustment)
 {