1 files changed, 16 insertions, 5 deletions

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 109b56267c8f..a033df00fd1d 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -500,15 +500,26 @@ static inline unsigned long lock_flag(enum lock_usage_bit bit)
 
 static char get_usage_char(struct lock_class *class, enum lock_usage_bit bit)
 {
+        /*
+         * The usage character defaults to '.' (i.e., irqs disabled and not in
+         * irq context), which is the safest usage category.
+         */
         char c = '.';
 
-        if (class->usage_mask & lock_flag(bit + LOCK_USAGE_DIR_MASK))
+        /*
+         * The order of the following usage checks matters, which will
+         * result in the outcome character as follows:
+         *
+         * - '+': irq is enabled and not in irq context
+         * - '-': in irq context and irq is disabled
+         * - '?': in irq context and irq is enabled
+         */
+        if (class->usage_mask & lock_flag(bit + LOCK_USAGE_DIR_MASK)) {
                 c = '+';
-        if (class->usage_mask & lock_flag(bit)) {
-                c = '-';
-                if (class->usage_mask & lock_flag(bit + LOCK_USAGE_DIR_MASK))
+                if (class->usage_mask & lock_flag(bit))
                         c = '?';
-        }
+        } else if (class->usage_mask & lock_flag(bit))
+                c = '-';
 
         return c;
 }