---

yaml --- r: 30700 b: refs/heads/master c: f85cd47 h: refs/heads/master v: v3
git-mirror · Jun 26, 2006 · 1ba4471 · 1ba4471
1 parent 6b47896
commit 1ba4471
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: ad8100e0d20e0123def9f83c040b68c96c8638f0
+refs/heads/master: f85cd47a5825b77a146bad6870b2ddcf08415c13
diff --git a/trunk/fs/ocfs2/dlm/dlmthread.c b/trunk/fs/ocfs2/dlm/dlmthread.c
@@ -731,7 +731,7 @@ static int dlm_thread(void *data)
 
 		/* yield and continue right away if there is more work to do */
 		if (!n) {
-			yield();
+			cond_resched();
 			continue;
 		}