aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/locks.c2
-rw-r--r--include/linux/sched.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/fs/locks.c b/fs/locks.c
index b6440f52178f..2eb81975c99c 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -768,7 +768,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)
768 * give it the opportunity to lock the file. 768 * give it the opportunity to lock the file.
769 */ 769 */
770 if (found) 770 if (found)
771 cond_resched_bkl(); 771 cond_resched();
772 772
773find_conflict: 773find_conflict:
774 for_each_lock(inode, before) { 774 for_each_lock(inode, before) {
diff --git a/include/linux/sched.h b/include/linux/sched.h
index c41d424db887..cbbfca69aa4a 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2305,8 +2305,6 @@ extern int __cond_resched_softirq(void);
2305 __cond_resched_softirq(); \ 2305 __cond_resched_softirq(); \
2306}) 2306})
2307 2307
2308#define cond_resched_bkl() cond_resched()
2309
2310/* 2308/*
2311 * Does a critical section need to be broken due to another 2309 * Does a critical section need to be broken due to another
2312 * task waiting?: (technically does not depend on CONFIG_PREEMPT, 2310 * task waiting?: (technically does not depend on CONFIG_PREEMPT,