The following commit has been merged into the locking/core branch of tip: Commit-ID: 0e8a89d49d45197770f2e57fb15f1bc9ded96eb0 Gitweb: https://git.kernel.org/tip/0e8a89d49d45197770f2e57fb15f1bc9ded96eb0 Author: Xiongwei Song <sxwjean@xxxxxxxxx> AuthorDate: Fri, 18 Jun 2021 21:02:30 +08:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Tue, 22 Jun 2021 16:42:09 +02:00 locking/lockdep: Correct the description error for check_redundant() If there is no matched result, check_redundant() will return BFS_RNOMATCH. Signed-off-by: Xiongwei Song <sxwjean@xxxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Reviewed-by: Boqun Feng <boqun.feng@xxxxxxxxx> Link: https://lkml.kernel.org/r/20210618130230.123249-1-sxwjean@xxxxxx --- kernel/locking/lockdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 0584b20..095c87f 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -2829,7 +2829,7 @@ static inline bool usage_skip(struct lock_list *entry, void *mask) * <target> or not. If it can, <src> -> <target> dependency is already * in the graph. * - * Return BFS_RMATCH if it does, or BFS_RMATCH if it does not, return BFS_E* if + * Return BFS_RMATCH if it does, or BFS_RNOMATCH if it does not, return BFS_E* if * any error appears in the bfs search. */ static noinline enum bfs_result
|