From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936682AbdIYWTv (ORCPT ); Mon, 25 Sep 2017 18:19:51 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:38540 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936021AbdIYWTs (ORCPT ); Mon, 25 Sep 2017 18:19:48 -0400 X-Google-Smtp-Source: AOwi7QD6jUv4TBvAUMi+RYL0sB9H2pxZQDDcciX6Af1HgykbnyKn/3//5G+ugeCM7bsV3Qczrrr4BQ== From: Boqun Feng To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Gautham R Shenoy , Byungchul Park , Boqun Feng Subject: [RFC tip/locking/lockdep v3 14/14] Revert "locking/lockdep/selftests: Fix mixed read-write ABBA tests" Date: Tue, 26 Sep 2017 06:18:48 +0800 Message-Id: <20170925221848.6646-15-boqun.feng@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170925221848.6646-1-boqun.feng@gmail.com> References: <20170925221848.6646-1-boqun.feng@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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