diff options
| author | Boqun Feng <boqun.feng@gmail.com> | 2020-08-07 10:42:36 +0300 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2020-08-26 13:42:07 +0300 |
| commit | 108dc42ed3507fe06214d51ab15fca7771df8bbd (patch) | |
| tree | d938aaae6fdccc806d04c31f618cfb1d043bf540 /lib/locking-selftest.c | |
| parent | 8ef7ca75120a39167def40f41daefee013c4b5af (diff) | |
| download | linux-108dc42ed3507fe06214d51ab15fca7771df8bbd.tar.xz | |
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.feng@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200807074238.1632519-18-boqun.feng@gmail.com
Diffstat (limited to 'lib/locking-selftest.c')
| -rw-r--r-- | lib/locking-selftest.c | 8 |
1 files changed, 0 insertions, 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); |