diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 15:41:14 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 15:41:14 +1000 |
| commit | 6d2c4faac6e3168b1ad7f77a8ac59dd8311cdb24 (patch) | |
| tree | a9254de014e20fa320e071862f7d80756ae641bb /include/linux | |
| parent | adc3aa587669e26f1e3b88226f58da89c3a0fe4e (diff) | |
| parent | 9a5fe747d99e1d562dde1f39259bbe2d098262ae (diff) | |
| download | linux-next-6d2c4faac6e3168b1ad7f77a8ac59dd8311cdb24.tar.gz linux-next-6d2c4faac6e3168b1ad7f77a8ac59dd8311cdb24.zip | |
Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git
# Conflicts:
# Makefile
# include/uapi/linux/android/binder.h
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kallsyms.h | 2 | ||||
| -rw-r--r-- | include/linux/spinlock.h | 25 |
2 files changed, 19 insertions, 8 deletions
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h index ad39636e0c3f..649faac31ddb 100644 --- a/include/linux/kallsyms.h +++ b/include/linux/kallsyms.h @@ -15,7 +15,7 @@ #include <asm/sections.h> -#define KSYM_NAME_LEN 128 +#define KSYM_NAME_LEN 512 #define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s %s]") + \ (KSYM_NAME_LEN - 1) + \ 2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + \ diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 5c0c5174155d..cdcbf9d9c70c 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h @@ -99,11 +99,17 @@ extern void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name, struct lock_class_key *key, short inner); +static inline void _raw_spin_lock_init(raw_spinlock_t *lock, const char *name, + struct lock_class_key *key) +{ + __raw_spin_lock_init(lock, name, key, LD_WAIT_SPIN); +} + # define raw_spin_lock_init(lock) \ do { \ static struct lock_class_key __key; \ \ - __raw_spin_lock_init((lock), #lock, &__key, LD_WAIT_SPIN); \ + _raw_spin_lock_init((lock), #lock, &__key); \ } while (0) #else @@ -326,12 +332,17 @@ static __always_inline raw_spinlock_t *spinlock_check(spinlock_t *lock) #ifdef CONFIG_DEBUG_SPINLOCK -# define spin_lock_init(lock) \ -do { \ - static struct lock_class_key __key; \ - \ - __raw_spin_lock_init(spinlock_check(lock), \ - #lock, &__key, LD_WAIT_CONFIG); \ +static inline void __spin_lock_init(spinlock_t *lock, const char *name, + struct lock_class_key *key) +{ + __raw_spin_lock_init(spinlock_check(lock), name, key, LD_WAIT_CONFIG); +} + +# define spin_lock_init(lock) \ +do { \ + static struct lock_class_key __key; \ + \ + __spin_lock_init(lock, #lock, &__key); \ } while (0) #else |