[RFC tip/locking/lockdep v3 14/14] Revert "locking/lockdep/selftests: Fix mixed read-write ABBA tests"

From: Boqun Feng
Date: Mon Sep 25 2017 - 18:19:54 EST


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@xxxxxxxxx>
---
lib/locking-selftest.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 0fe16f06ed00..1a28d68ec8b6 100644
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -2265,12 +2265,6 @@ void locking_selftest(void)
print_testname("mixed read-lock/lock-write ABBA");
pr_cont(" |");
dotest(rlock_ABBA1, FAILURE, LOCKTYPE_RWLOCK);
- /*
- * Lockdep does indeed fail here, but there's nothing we can do about
- * that now. Don't kill lockdep for it.
- */
- unexpected_testcase_failures--;
-
pr_cont(" |");
dotest(rwsem_ABBA1, FAILURE, LOCKTYPE_RWSEM);

--
2.14.1