: mutex: Fix !CONFIG_MUTEX_SPIN_ON_OWNER compile warning
PATCH 1/1 : mutex: Fix !CONFIG_MUTEX_SPIN_ON_OWNER compile warning
Fixes linux-next !CONFIG_MUTEX_SPIN_ON_OWNER compile warning:
kernel/mutex.c: In function ‘__mutex_lock_common’:kernel/mutex.c:148: error: unused variable ‘timeout’
timeout is only used if CONFIG_MUTEX_SPIN_ON_OWNER is on.
kernel/mutex.c +2 -0
@@ -145,7 +145,9 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,struct task_struct *task = current;struct mutex_waiter waiter;unsigned long flags; +#ifdef CONFIG_MUTEX_SPIN_ON_OWNER unsigned long timeout; +#endif preempt_disable ();mutex_acquire (&lock->dep_map, subclass,0 , ip);
Quoted 14 lines · Prarit Bhargava
Fixes linux-next !CONFIG_MUTEX_SPIN_ON_OWNER compile warning:
kernel/mutex.c: In function ‘__mutex_lock_common’:kernel/mutex.c:148: error: unused variable ‘timeout’timeout is only used if
CONFIG_MUTEX_SPIN_ON_OWNERis on.Signed-off-by Prarit Bhargava <[email protected]>kernel/mutex.c +0
-0
kernel/mutex.c __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, · line 150
Quoted 6 lines
kernel/mutex.c +2
-0@@ -145,7 +145,9 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,struct task_struct *task = current;struct mutex_waiter waiter;unsigned long flags; +#ifdef CONFIG_MUTEX_SPIN_ON_OWNER unsigned long timeout; +#endif
Andrew had a patch that fixed it with a "__used" tag. Either way that doesn't look much proper.
It would be much nicer to put the mutex spinning in a separate function, that would be a stub with !CONFIG_MUTEX_SPIN_ON_OWNER.
Quoted 14 lines · Prarit Bhargava
Fixes linux-next !CONFIG_MUTEX_SPIN_ON_OWNER compile warning:
kernel/mutex.c: In function ‘__mutex_lock_common’:kernel/mutex.c:148: error: unused variable ‘timeout’timeout is only used if
CONFIG_MUTEX_SPIN_ON_OWNERis on.Signed-off-by Prarit Bhargava <[email protected]>kernel/mutex.c +0
-0
kernel/mutex.c __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, · line 153
Quoted 9 lines
kernel/mutex.c +2
-0@@ -145,7 +145,9 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,struct task_struct *task = current;struct mutex_waiter waiter;unsigned long flags; +#ifdef CONFIG_MUTEX_SPIN_ON_OWNER unsigned long timeout; +#endif preempt_disable ();mutex_acquire (&lock->dep_map, subclass,0 , ip);
In fact the situation is a bit more complicated.
There are two things that are related to this build warning:
- the lock inversion prevention against the bkl
- the timeout for other purposes, basically to limit too long spins
And the lock inversion fix needs to be standalone because it should be backported to the stable branches.
So it seems that the plans are more:
1) have a clean patch that only prevents from the bkl lock inversion
2) thinking about the timeout, may be find something better if we can
All in one, I suspect these patches will be refactored rather than improved incrementally, to make the backport of 1) easier.
So the warning issue will probably disappear in the meantime.