---

yaml --- r: 158328 b: refs/heads/master c: def01bc h: refs/heads/master v: v3
git-mirror · Jul 18, 2009 · 50631f6 · 50631f6
1 parent 2b24aff
commit 50631f6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 613afbf83298efaead05ebcac23d2285609d7160
+refs/heads/master: def01bc53d03881acfc393bd10a5c7575187e008
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
@@ -768,7 +768,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)
 	 * give it the opportunity to lock the file.
 	 */
 	if (found)
-		cond_resched_bkl();
+		cond_resched();
 
 find_conflict:
 	for_each_lock(inode, before) {

diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
@@ -2305,8 +2305,6 @@ extern int __cond_resched_softirq(void);
 	__cond_resched_softirq();				\
 })
 
-#define cond_resched_bkl()	cond_resched()
-
 /*
  * Does a critical section need to be broken due to another
  * task waiting?: (technically does not depend on CONFIG_PREEMPT,