Commit 364f6afc authored by Bart Van Assche's avatar Bart Van Assche Committed by Ingo Molnar
Browse files

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



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

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarPeter 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: default avatarIngo Molnar <mingo@kernel.org>
parent 6c11c6e3

include/linux/lockdep.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ struct lock_class { 
	 */

	struct list_head		locks_after, locks_before;



	struct lockdep_subclass_key	*key;

	const struct lockdep_subclass_key *key;

	unsigned int			subclass;

	unsigned int			dep_gen_id;

kernel/locking/lockdep.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static const char *usage_str[] = 
};

#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);

}

kernel/locking/lockdep_internals.h

+2 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ extern struct lock_chain lock_chains[]; 
extern void get_usage_chars(struct lock_class *class,

			    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);

kernel/locking/lockdep_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

	struct lockdep_subclass_key *ckey;

	const struct lockdep_subclass_key *ckey;

	struct lock_class_stats *stats;

	struct lock_class *class;

	const char *cname;

CRA Git | Maintained and supported by SUSTech CRA and CCSE