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: 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>

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 0b0d7259276dd8fc5f96e12b23307a15fd8c5e85..cdb3c2f06092e79f70374d2542b5d127b4391cad 100644 (file)
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -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;
 

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 4861cf8e274b1c75ec73260e13131463b35dad49..af6627866191ee29bd89f7b128610bc162b6bcdd 100644 (file)
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -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);
 }

diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h
index cc83568d501256b39d126ba2a96be2002e3451df..2e518369add4be8b107927b56e21edd9bc79c648 100644 (file)
--- a/kernel/locking/lockdep_internals.h
+++ b/kernel/locking/lockdep_internals.h
@@ -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);
 

diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
index bda006f8a88be11c83bdb6fce4b63b9bf8d6e608..ed9842425cac25d363d83c7781a02c28787978fa 100644 (file)
--- a/kernel/locking/lockdep_proc.c
+++ b/kernel/locking/lockdep_proc.c
@@ -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;