From 56289e7c886e1778f910cceb049e34bb38a123d2 Mon Sep 17 00:00:00 2001 From: Lucia Rosculete Date: Sat, 3 Mar 2012 16:18:47 +0200 Subject: [PATCH] --- yaml --- r: 305094 b: refs/heads/master c: f7232f0808d9c9899cbecf79296b0293217a27cd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/semaphore.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9ed7d2ac51ff..0ef862d305a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4deb508e91624ab0ff1812825870c7dcf7812690 +refs/heads/master: f7232f0808d9c9899cbecf79296b0293217a27cd diff --git a/trunk/kernel/semaphore.c b/trunk/kernel/semaphore.c index 60636a4e25c3..4567fc020fe3 100644 --- a/trunk/kernel/semaphore.c +++ b/trunk/kernel/semaphore.c @@ -118,7 +118,7 @@ EXPORT_SYMBOL(down_killable); * down_trylock - try to acquire the semaphore, without waiting * @sem: the semaphore to be acquired * - * Try to acquire the semaphore atomically. Returns 0 if the mutex has + * Try to acquire the semaphore atomically. Returns 0 if the semaphore has * been acquired successfully or 1 if it it cannot be acquired. * * NOTE: This return value is inverted from both spin_trylock and