diff options
Diffstat (limited to 'kernel/locking')
-rw-r--r-- | kernel/locking/qspinlock_paravirt.h | 2 | ||||
-rw-r--r-- | kernel/locking/qspinlock_stat.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/kernel/locking/qspinlock_paravirt.h b/kernel/locking/qspinlock_paravirt.h index 37649e69056c..8a99abf58080 100644 --- a/kernel/locking/qspinlock_paravirt.h +++ b/kernel/locking/qspinlock_paravirt.h | |||
@@ -450,7 +450,7 @@ pv_wait_head_or_lock(struct qspinlock *lock, struct mcs_spinlock *node) | |||
450 | goto gotlock; | 450 | goto gotlock; |
451 | } | 451 | } |
452 | } | 452 | } |
453 | WRITE_ONCE(pn->state, vcpu_halted); | 453 | WRITE_ONCE(pn->state, vcpu_hashed); |
454 | qstat_inc(qstat_pv_wait_head, true); | 454 | qstat_inc(qstat_pv_wait_head, true); |
455 | qstat_inc(qstat_pv_wait_again, waitcnt); | 455 | qstat_inc(qstat_pv_wait_again, waitcnt); |
456 | pv_wait(&l->locked, _Q_SLOW_VAL); | 456 | pv_wait(&l->locked, _Q_SLOW_VAL); |
diff --git a/kernel/locking/qspinlock_stat.h b/kernel/locking/qspinlock_stat.h index 22e025309845..b9d031516254 100644 --- a/kernel/locking/qspinlock_stat.h +++ b/kernel/locking/qspinlock_stat.h | |||
@@ -153,7 +153,6 @@ static ssize_t qstat_read(struct file *file, char __user *user_buf, | |||
153 | */ | 153 | */ |
154 | if ((counter == qstat_pv_latency_kick) || | 154 | if ((counter == qstat_pv_latency_kick) || |
155 | (counter == qstat_pv_latency_wake)) { | 155 | (counter == qstat_pv_latency_wake)) { |
156 | stat = 0; | ||
157 | if (kicks) | 156 | if (kicks) |
158 | stat = DIV_ROUND_CLOSEST_ULL(stat, kicks); | 157 | stat = DIV_ROUND_CLOSEST_ULL(stat, kicks); |
159 | } | 158 | } |