| From | Boqun Feng <> | Subject | [RFC v7 17/19] Revert "locking/lockdep/selftests: Fix mixed read-write ABBA tests" | Date | Fri, 7 Aug 2020 15:42:36 +0800 |
| |
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.feng@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 76c314ab4f03..4264cf4b60bb 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); -- 2.28.0
|