From: Yuyang Du <duyuyang@gmail.com>
To: peterz@infradead.org, will.deacon@arm.com, mingo@kernel.org
Cc: bvanassche@acm.org, ming.lei@redhat.com, frederic@kernel.org,
tglx@linutronix.de, linux-kernel@vger.kernel.org,
Yuyang Du <duyuyang@gmail.com>
Subject: [PATCH v2 04/23] locking/lockdep: Remove useless conditional macro
Date: Mon, 6 May 2019 16:19:20 +0800 [thread overview]
Message-ID: <20190506081939.74287-5-duyuyang@gmail.com> (raw)
In-Reply-To: <20190506081939.74287-1-duyuyang@gmail.com>
Since #defined(CONFIG_PROVE_LOCKING) is used in the scope of #ifdef
CONFIG_PROVE_LOCKING, it can be removed.
Signed-off-by: Yuyang Du <duyuyang@gmail.com>
---
kernel/locking/lockdep.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 720d195..a0837a0 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -1669,7 +1669,7 @@ unsigned long lockdep_count_backward_deps(struct lock_class *class)
return result;
}
-#if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING)
+#ifdef CONFIG_TRACE_IRQFLAGS
static inline int usage_accumulate(struct lock_list *entry, void *mask)
{
@@ -2147,7 +2147,7 @@ static inline void inc_chains(void)
nr_process_chains++;
}
-#endif
+#endif /* CONFIG_TRACE_IRQFLAGS */
static void
print_deadlock_scenario(struct held_lock *nxt, struct held_lock *prv)
@@ -2828,7 +2828,7 @@ static inline int validate_chain(struct task_struct *curr,
static void print_lock_trace(struct lock_trace *trace, unsigned int spaces)
{
}
-#endif
+#endif /* CONFIG_PROVE_LOCKING */
/*
* We are building curr_chain_key incrementally, so double-check
--
1.8.3.1
next prev parent reply other threads:[~2019-05-06 8:20 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-06 8:19 [PATCH v2 00/23] locking/lockdep: Small improvements Yuyang Du
2019-05-06 8:19 ` [PATCH v2 01/23] locking/lockdep: Change all print_*() return type to void Yuyang Du
2019-06-03 13:06 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 02/23] locking/lockdep: Add description and explanation in lockdep design doc Yuyang Du
2019-06-03 13:07 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 03/23] locking/lockdep: Adjust lock usage bit character checks Yuyang Du
2019-06-03 13:07 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` Yuyang Du [this message]
2019-06-03 13:08 ` [tip:locking/core] locking/lockdep: Remove useless conditional macro tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 05/23] locking/lockdep: Print the right depth for chain key colission Yuyang Du
2019-06-03 13:09 ` [tip:locking/core] locking/lockdep: Print the right depth for chain key collision tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 06/23] locking/lockdep: Update obsolete struct field description Yuyang Du
2019-06-03 13:09 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 07/23] locking/lockdep: Use lockdep_init_task for task initiation consistently Yuyang Du
2019-06-03 13:10 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 08/23] locking/lockdep: Define INITIAL_CHAIN_KEY for chain keys to start with Yuyang Du
2019-06-03 13:11 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 09/23] locking/lockdep: Change the range of class_idx in held_lock struct Yuyang Du
2019-06-03 13:12 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 10/23] locking/lockdep: Remove unused argument in validate_chain() and check_deadlock() Yuyang Du
2019-06-03 13:12 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 11/23] locking/lockdep: Update comment Yuyang Du
2019-06-03 13:13 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 12/23] locking/lockdep: Change type of the element field in circular_queue Yuyang Du
2019-06-03 13:14 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 13/23] locking/lockdep: Change the return type of __cq_dequeue() Yuyang Du
2019-06-03 13:15 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 14/23] locking/lockdep: Avoid constant checks in __bfs by using offset reference Yuyang Du
2019-06-03 13:15 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 15/23] locking/lockdep: Update comments on dependency search Yuyang Du
2019-06-03 13:16 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 16/23] locking/lockdep: Add explanation to lock usage rules in lockdep design doc Yuyang Du
2019-06-03 13:17 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 17/23] locking/lockdep: Remove redundant argument in check_deadlock Yuyang Du
2019-06-03 13:18 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 18/23] locking/lockdep: Remove unused argument in __lock_release Yuyang Du
2019-06-03 13:18 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 19/23] locking/lockdep: Refactorize check_noncircular and check_redundant Yuyang Du
2019-06-03 13:19 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 20/23] locking/lockdep: Check redundant dependency only when CONFIG_LOCKDEP_SMALL Yuyang Du
2019-06-03 13:20 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 21/23] locking/lockdep: Consolidate lock usage bit initialization Yuyang Du
2019-06-03 13:20 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 22/23] locking/lockdep: Adjust new bit cases in mark_lock Yuyang Du
2019-06-03 13:21 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-06 8:19 ` [PATCH v2 23/23] locking/lockdep: Remove !dir in lock irq usage check Yuyang Du
2019-06-03 13:22 ` [tip:locking/core] " tip-bot for Yuyang Du
2019-05-08 8:55 ` [PATCH v2 00/23] locking/lockdep: Small improvements Peter Zijlstra
2019-05-09 0:50 ` Yuyang Du
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190506081939.74287-5-duyuyang@gmail.com \
--to=duyuyang@gmail.com \
--cc=bvanassche@acm.org \
--cc=frederic@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ming.lei@redhat.com \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®