summaryrefslogtreecommitdiffstats
path: root/lib/rwsem.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-30 23:45:41 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-30 23:45:41 -0400
commit1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch)
tree64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /lib/rwsem.c
parentaebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff)
parent1bdfd554be94def718323659173517c5d4a69d25 (diff)
downloadkernel-crypto-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.tar.gz
kernel-crypto-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.tar.xz
kernel-crypto-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.zip
Merge branch 'master' into upstream
Diffstat (limited to 'lib/rwsem.c')
-rw-r--r--lib/rwsem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rwsem.c b/lib/rwsem.c
index b322421c296..901d0e7da89 100644
--- a/lib/rwsem.c
+++ b/lib/rwsem.c
@@ -146,7 +146,7 @@ __rwsem_do_wake(struct rw_semaphore *sem, int downgrading)
/*
* wait for a lock to be granted
*/
-static inline struct rw_semaphore *
+static struct rw_semaphore *
rwsem_down_failed_common(struct rw_semaphore *sem,
struct rwsem_waiter *waiter, signed long adjustment)
{