---

yaml --- r: 264814 b: refs/heads/master c: ca4a04c h: refs/heads/master v: v3
git-mirror · Sep 15, 2011 · 1bea458 · 1bea458
1 parent 825590b
commit 1bea458
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77cd7693787d0021786078da22a015cea938e466
+refs/heads/master: ca4a04cf3dd0cecb5e7188ed7796cc55fc13aeb1
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
@@ -1763,7 +1763,7 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q,
  *
  * Returns:
  *  0 - uaddr contains val and hb has been locked
- * <1 - -EFAULT or -EWOULDBLOCK (uaddr does not contain val) and hb is unlcoked
+ * <1 - -EFAULT or -EWOULDBLOCK (uaddr does not contain val) and hb is unlocked
  */
 static int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags,
 			   struct futex_q *q, struct futex_hash_bucket **hb)