On 3/4/24 05:56, Geert Uytterhoeven wrote:
> If CONFIG_GENERIC_LOCKBREAK=y and CONFIG_DEBUG_LOCK_ALLOC=n
> (e.g. sh/sdk7786_defconfig):
>
> kernel/locking/spinlock.c:68:17: warning: no previous prototype for '__raw_spin_lock' [-Wmissing-prototypes]
> kernel/locking/spinlock.c:80:26: warning: no previous prototype for '__raw_spin_lock_irqsave' [-Wmissing-prototypes]
> kernel/locking/spinlock.c:98:17: warning: no previous prototype for '__raw_spin_lock_irq' [-Wmissing-prototypes]
> kernel/locking/spinlock.c:103:17: warning: no previous prototype for '__raw_spin_lock_bh' [-Wmissing-prototypes]
> kernel/locking/spinlock.c:68:17: warning: no previous prototype for '__raw_read_lock' [-Wmissing-prototypes]
> kernel/locking/spinlock.c:80:26: warning: no previous prototype for '__raw_read_lock_irqsave' [-Wmissing-prototypes]
> kernel/locking/spinlock.c:98:17: warning: no previous prototype for '__raw_read_lock_irq' [-Wmissing-prototypes]
> kernel/locking/spinlock.c:103:17: warning: no previous prototype for '__raw_read_lock_bh' [-Wmissing-prototypes]
> kernel/locking/spinlock.c:68:17: warning: no previous prototype for '__raw_write_lock' [-Wmissing-prototypes]
> kernel/locking/spinlock.c:80:26: warning: no previous prototype for '__raw_write_lock_irqsave' [-Wmissing-prototypes]
> kernel/locking/spinlock.c:98:17: warning: no previous prototype for '__raw_write_lock_irq' [-Wmissing-prototypes]
> kernel/locking/spinlock.c:103:17: warning: no previous prototype for '__raw_write_lock_bh' [-Wmissing-prototypes]
>
> All __raw_* lock ops are internal functions without external callers.
> Hence fix this by making them static.
>
> Note that if CONFIG_GENERIC_LOCKBREAK=y, no lock ops are inlined, as all
> of CONFIG_INLINE_*_LOCK* depend on !GENERIC_LOCKBREAK.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Acked-by: Waiman Long <[email protected]>
Thanks for updating the change log.
Cheers,
Longman
> ---
> Compile-tested on all defconfigs that have CONFIG_GENERIC_LOCKBREAK=y:
> - sh/sdk7786_defconfig,
> - sh/shx3_defconfig,
> - s390/debug_defconfig,
> and also on s390/debug_defconfig after changing:
> CONFIG_DEBUG_LOCK_ALLOC=n
> CONFIG_DEBUG_WW_MUTEX_SLOWPATH=n
> CONFIG_LOCK_STAT=n
> CONFIG_PROVE_LOCKING=n
>
> v2:
> - Add Acked-by,
> - Drop RFC,
> - Improve patch description.
> ---
> kernel/locking/spinlock.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/locking/spinlock.c b/kernel/locking/spinlock.c
> index 8475a0794f8c5ad2..7009b568e6255d64 100644
> --- a/kernel/locking/spinlock.c
> +++ b/kernel/locking/spinlock.c
> @@ -65,7 +65,7 @@ EXPORT_PER_CPU_SYMBOL(__mmiowb_state);
> * towards that other CPU that it should break the lock ASAP.
> */
> #define BUILD_LOCK_OPS(op, locktype) \
> -void __lockfunc __raw_##op##_lock(locktype##_t *lock) \
> +static void __lockfunc __raw_##op##_lock(locktype##_t *lock) \
> { \
> for (;;) { \
> preempt_disable(); \
> @@ -77,7 +77,7 @@ void __lockfunc __raw_##op##_lock(locktype##_t *lock) \
> } \
> } \
> \
> -unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \
> +static unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \
> { \
> unsigned long flags; \
> \
> @@ -95,12 +95,12 @@ unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \
> return flags; \
> } \
> \
> -void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock) \
> +static void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock) \
> { \
> _raw_##op##_lock_irqsave(lock); \
> } \
> \
> -void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \
> +static void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \
> { \
> unsigned long flags; \
> \