iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

locking/lockdep: Make it clear that what lock_class::key points at is not modified

Browse Source 
This patch does not change the behavior of the lockdep code.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Waiman Long <longman@redhat.com>
Cc: Will Deacon <will.deacon@arm.com>
Link: https://lkml.kernel.org/r/20190722182443.216015-2-bvanassche@acm.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Bart Van Assche
2019-07-22 11:24:40 -07:00
committed by Ingo Molnar
parent 6c11c6e3d5
commit 364f6afc4f
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/lockdep.h
View File

@ -97,7 +97,7 @@ struct lock_class {
*/ */
struct list_head locks_after, locks_before; struct list_head locks_after, locks_before;
struct lockdep_subclass_key *key; const struct lockdep_subclass_key *key;
unsigned int subclass; unsigned int subclass;
unsigned int dep_gen_id; unsigned int dep_gen_id;

2
kernel/locking/lockdep.c
View File

@ -511,7 +511,7 @@ static const char *usage_str[] =
}; };
#endif #endif
const char * __get_key_name(struct lockdep_subclass_key *key, char *str) const char *__get_key_name(const struct lockdep_subclass_key *key, char *str)
{ {
return kallsyms_lookup((unsigned long)key, NULL, NULL, NULL, str); return kallsyms_lookup((unsigned long)key, NULL, NULL, NULL, str);
} }

3
kernel/locking/lockdep_internals.h
View File

@ -116,7 +116,8 @@ extern struct lock_chain lock_chains[];
extern void get_usage_chars(struct lock_class *class, extern void get_usage_chars(struct lock_class *class,
char usage[LOCK_USAGE_CHARS]); char usage[LOCK_USAGE_CHARS]);
extern const char * __get_key_name(struct lockdep_subclass_key *key, char *str); extern const char *__get_key_name(const struct lockdep_subclass_key *key,
char *str);
struct lock_class *lock_chain_get_class(struct lock_chain *chain, int i); struct lock_class *lock_chain_get_class(struct lock_chain *chain, int i);

2
kernel/locking/lockdep_proc.c
View File

@ -399,7 +399,7 @@ static void seq_lock_time(struct seq_file *m, struct lock_time *lt)
static void seq_stats(struct seq_file *m, struct lock_stat_data *data) static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
{ {
struct lockdep_subclass_key *ckey; const struct lockdep_subclass_key *ckey;
struct lock_class_stats *stats; struct lock_class_stats *stats;
struct lock_class *class; struct lock_class *class;
const char *cname; const char *cname;