sched: Change task_struct::state
Change the type and name of task_struct::state. Drop the volatile and shrink it to an 'unsigned int'. Rename it in order to find all uses such that we can use READ_ONCE/WRITE_ONCE as appropriate. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Daniel Bristot de Oliveira <bristot@redhat.com> Acked-by: Will Deacon <will@kernel.org> Acked-by: Daniel Thompson <daniel.thompson@linaro.org> Link: https://lore.kernel.org/r/20210611082838.550736351@infradead.org
This commit is contained in:
parent
7c3edd6d9c
commit
2f064a59a1
28 changed files with 123 additions and 111 deletions
|
|
@ -923,7 +923,7 @@ __ww_mutex_add_waiter(struct mutex_waiter *waiter,
|
|||
* Lock a mutex (possibly interruptible), slowpath:
|
||||
*/
|
||||
static __always_inline int __sched
|
||||
__mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
|
||||
__mutex_lock_common(struct mutex *lock, unsigned int state, unsigned int subclass,
|
||||
struct lockdep_map *nest_lock, unsigned long ip,
|
||||
struct ww_acquire_ctx *ww_ctx, const bool use_ww_ctx)
|
||||
{
|
||||
|
|
@ -1098,14 +1098,14 @@ err_early_kill:
|
|||
}
|
||||
|
||||
static int __sched
|
||||
__mutex_lock(struct mutex *lock, long state, unsigned int subclass,
|
||||
__mutex_lock(struct mutex *lock, unsigned int state, unsigned int subclass,
|
||||
struct lockdep_map *nest_lock, unsigned long ip)
|
||||
{
|
||||
return __mutex_lock_common(lock, state, subclass, nest_lock, ip, NULL, false);
|
||||
}
|
||||
|
||||
static int __sched
|
||||
__ww_mutex_lock(struct mutex *lock, long state, unsigned int subclass,
|
||||
__ww_mutex_lock(struct mutex *lock, unsigned int state, unsigned int subclass,
|
||||
struct lockdep_map *nest_lock, unsigned long ip,
|
||||
struct ww_acquire_ctx *ww_ctx)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1135,7 +1135,7 @@ void __sched rt_mutex_init_waiter(struct rt_mutex_waiter *waiter)
|
|||
*
|
||||
* Must be called with lock->wait_lock held and interrupts disabled
|
||||
*/
|
||||
static int __sched __rt_mutex_slowlock(struct rt_mutex *lock, int state,
|
||||
static int __sched __rt_mutex_slowlock(struct rt_mutex *lock, unsigned int state,
|
||||
struct hrtimer_sleeper *timeout,
|
||||
struct rt_mutex_waiter *waiter)
|
||||
{
|
||||
|
|
@ -1190,7 +1190,7 @@ static void __sched rt_mutex_handle_deadlock(int res, int detect_deadlock,
|
|||
/*
|
||||
* Slow path lock function:
|
||||
*/
|
||||
static int __sched rt_mutex_slowlock(struct rt_mutex *lock, int state,
|
||||
static int __sched rt_mutex_slowlock(struct rt_mutex *lock, unsigned int state,
|
||||
struct hrtimer_sleeper *timeout,
|
||||
enum rtmutex_chainwalk chwalk)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -889,7 +889,7 @@ rwsem_spin_on_owner(struct rw_semaphore *sem)
|
|||
* Wait for the read lock to be granted
|
||||
*/
|
||||
static struct rw_semaphore __sched *
|
||||
rwsem_down_read_slowpath(struct rw_semaphore *sem, long count, int state)
|
||||
rwsem_down_read_slowpath(struct rw_semaphore *sem, long count, unsigned int state)
|
||||
{
|
||||
long adjustment = -RWSEM_READER_BIAS;
|
||||
long rcnt = (count >> RWSEM_READER_SHIFT);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue