kernel: Replace ASSIGN_ONCE w/ WRITE_ONCE in post-import patches

Fixes: "kernel: Change ASSIGN_ONCE(val, x) to WRITE_ONCE(x, val)"
This commit is contained in:
syphyr 2019-04-01 23:24:16 +02:00
parent b4de270d6f
commit a895524ae2
3 changed files with 8 additions and 8 deletions

View File

@ -100,7 +100,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
prev = decode_cpu(old);
node->prev = prev;
ASSIGN_ONCE(node, prev->next);
WRITE_ONCE(prev->next, node);
/*
* Normally @prev is untouchable after the above store; because at that
@ -185,8 +185,8 @@ unqueue:
* it will wait in Step-A.
*/
ASSIGN_ONCE(prev, next->prev);
ASSIGN_ONCE(next, prev->next);
WRITE_ONCE(next->prev, prev);
WRITE_ONCE(prev->next, next);
return false;
}

View File

@ -62,10 +62,10 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
return;
}
/*
* BluesMan: Change from ACCESS_ONCE to ASSIGN_ONCE
* BluesMan: Change from ACCESS_ONCE to WRITE_ONCE
*
*/
ASSIGN_ONCE(node, prev->next);
WRITE_ONCE(prev->next, node);
/* Wait until the lock holder passes the lock down. */
arch_mcs_spin_lock_contended(&node->locked);

View File

@ -191,7 +191,7 @@ clear_pending_set_locked(struct qspinlock *lock, u32 val)
{
struct __qspinlock *l = (void *)lock;
ASSIGN_ONCE(_Q_LOCKED_VAL,l->locked_pending);
WRITE_ONCE(l->locked_pending, _Q_LOCKED_VAL);
}
/*
@ -276,7 +276,7 @@ static __always_inline void set_locked(struct qspinlock *lock)
{
struct __qspinlock *l = (void *)lock;
ASSIGN_ONCE(_Q_LOCKED_VAL, l->locked);
WRITE_ONCE(l->locked, _Q_LOCKED_VAL);
}
/**
@ -471,7 +471,7 @@ queue:
*/
if (old & _Q_TAIL_MASK) {
prev = decode_tail(old);
ASSIGN_ONCE(node, prev->next);
WRITE_ONCE(prev->next, node);
#ifdef CONFIG_DEBUG_QUEUE_SPINLOCK
trace_printk("we've cpu %d ahead of us\n",
(old >> _Q_TAIL_CPU_OFFSET) - 1);