summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Begunkov <asml.silence@gmail.com>2021-05-17 15:30:12 +0200
committerThomas Gleixner <tglx@linutronix.de>2021-05-25 17:30:15 +0200
commita82adc7650044b5555d65078bda07866efa4a73d (patch)
tree30df6594ac94489559ca330b1ecd412f4316d1cc
parentselftests: futex: Expand timeout test (diff)
downloadlinux-a82adc7650044b5555d65078bda07866efa4a73d.tar.xz
linux-a82adc7650044b5555d65078bda07866efa4a73d.zip
futex: Deduplicate cond_resched() invocation in futex_wake_op()
After pagefaulting in futex_wake_op() both branches do cond_resched() before retry. Deduplicate it as compilers cannot figure it out themself. Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Davidlohr Bueso <dbueso@suse.de> Link: https://lore.kernel.org/r/9b2588c1fd33c91fb01c4e348a3b647ab2c8baab.1621258128.git.asml.silence@gmail.com
-rw-r--r--kernel/futex.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 2f386f012900..08008c225bec 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1728,12 +1728,9 @@ retry_private:
return ret;
}
- if (!(flags & FLAGS_SHARED)) {
- cond_resched();
- goto retry_private;
- }
-
cond_resched();
+ if (!(flags & FLAGS_SHARED))
+ goto retry_private;
goto retry;
}