The following commit has been merged into the locking/core branch of tip: Commit-ID: 108dc42ed3507fe06214d51ab15fca7771df8bbd Gitweb: https://git.kernel.org/tip/108dc42ed3507fe06214d51ab15fca7771df8bbd Author: Boqun Feng <boqun.f...@gmail.com> AuthorDate: Fri, 07 Aug 2020 15:42:36 +08:00 Committer: Peter Zijlstra <pet...@infradead.org> CommitterDate: Wed, 26 Aug 2020 12:42:07 +02:00
Revert "locking/lockdep/selftests: Fix mixed read-write ABBA tests" This reverts commit d82fed75294229abc9d757f08a4817febae6c4f4. Since we now could handle mixed read-write deadlock detection well, the self tests could be detected as expected, no need to use this work-around. Signed-off-by: Boqun Feng <boqun.f...@gmail.com> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Link: https://lkml.kernel.org/r/20200807074238.1632519-18-boqun.f...@gmail.com --- lib/locking-selftest.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c index 76c314a..4264cf4 100644 --- a/lib/locking-selftest.c +++ b/lib/locking-selftest.c @@ -2273,14 +2273,6 @@ void locking_selftest(void) print_testname("mixed read-lock/lock-write ABBA"); pr_cont(" |"); dotest(rlock_ABBA1, FAILURE, LOCKTYPE_RWLOCK); -#ifdef CONFIG_PROVE_LOCKING - /* - * Lockdep does indeed fail here, but there's nothing we can do about - * that now. Don't kill lockdep for it. - */ - unexpected_testcase_failures--; -#endif - pr_cont(" |"); dotest(rwsem_ABBA1, FAILURE, LOCKTYPE_RWSEM);
