[PATCH 1/1] semaphore: declare down_try

From: Jiri Slaby
Date: Wed Jul 30 2008 - 07:26:00 EST


Maybe you already fixed this, in todays mmotm there is a fix of duplicate
down_try definiton, but this problem still persist.
--

down_trylock is superseded by down_try, but prototypes in header
files remained unchanged.

Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
---
include/linux/semaphore.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
index 7415839..ca153ec 100644
--- a/include/linux/semaphore.h
+++ b/include/linux/semaphore.h
@@ -42,7 +42,7 @@ static inline void sema_init(struct semaphore *sem, int val)
extern void down(struct semaphore *sem);
extern int __must_check down_interruptible(struct semaphore *sem);
extern int __must_check down_killable(struct semaphore *sem);
-extern int __must_check down_trylock(struct semaphore *sem);
+extern int __must_check down_try(struct semaphore *sem);
extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
extern void up(struct semaphore *sem);

--
1.5.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/