1 files changed, 14 insertions, 3 deletions

diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index 3190997df9ca..e089157dcf97 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -451,9 +451,20 @@ extern int _atomic_dec_and_lock_irqsave(atomic_t *atomic, spinlock_t *lock,
 #define atomic_dec_and_lock_irqsave(atomic, lock, flags) \
                 __cond_lock(lock, _atomic_dec_and_lock_irqsave(atomic, lock, &(flags)))
 
-int alloc_bucket_spinlocks(spinlock_t **locks, unsigned int *lock_mask,
-                           size_t max_size, unsigned int cpu_mult,
-                           gfp_t gfp);
+int __alloc_bucket_spinlocks(spinlock_t **locks, unsigned int *lock_mask,
+                             size_t max_size, unsigned int cpu_mult,
+                             gfp_t gfp, const char *name,
+                             struct lock_class_key *key);
+
+#define alloc_bucket_spinlocks(locks, lock_mask, max_size, cpu_mult, gfp)    \
+        ({                                                                   \
+                static struct lock_class_key key;                            \
+                int ret;                                                     \
+                                                                             \
+                ret = __alloc_bucket_spinlocks(locks, lock_mask, max_size,   \
+                                               cpu_mult, gfp, #locks, &key); \
+                ret;                                                         \
+        })
 
 void free_bucket_spinlocks(spinlock_t *locks);