diff options
Diffstat (limited to 'kernel/locking/qspinlock.c')
-rw-r--r-- | kernel/locking/qspinlock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/locking/qspinlock.c b/kernel/locking/qspinlock.c index 5e9247dc2515..e14b32c69639 100644 --- a/kernel/locking/qspinlock.c +++ b/kernel/locking/qspinlock.c | |||
@@ -395,7 +395,7 @@ void queued_spin_lock_slowpath(struct qspinlock *lock, u32 val) | |||
395 | * 0,1,0 -> 0,0,1 | 395 | * 0,1,0 -> 0,0,1 |
396 | */ | 396 | */ |
397 | clear_pending_set_locked(lock); | 397 | clear_pending_set_locked(lock); |
398 | qstat_inc(qstat_lock_pending, true); | 398 | lockevent_inc(lock_pending); |
399 | return; | 399 | return; |
400 | 400 | ||
401 | /* | 401 | /* |
@@ -403,7 +403,7 @@ void queued_spin_lock_slowpath(struct qspinlock *lock, u32 val) | |||
403 | * queuing. | 403 | * queuing. |
404 | */ | 404 | */ |
405 | queue: | 405 | queue: |
406 | qstat_inc(qstat_lock_slowpath, true); | 406 | lockevent_inc(lock_slowpath); |
407 | pv_queue: | 407 | pv_queue: |
408 | node = this_cpu_ptr(&qnodes[0].mcs); | 408 | node = this_cpu_ptr(&qnodes[0].mcs); |
409 | idx = node->count++; | 409 | idx = node->count++; |
@@ -419,7 +419,7 @@ pv_queue: | |||
419 | * simple enough. | 419 | * simple enough. |
420 | */ | 420 | */ |
421 | if (unlikely(idx >= MAX_NODES)) { | 421 | if (unlikely(idx >= MAX_NODES)) { |
422 | qstat_inc(qstat_lock_no_node, true); | 422 | lockevent_inc(lock_no_node); |
423 | while (!queued_spin_trylock(lock)) | 423 | while (!queued_spin_trylock(lock)) |
424 | cpu_relax(); | 424 | cpu_relax(); |
425 | goto release; | 425 | goto release; |
@@ -430,7 +430,7 @@ pv_queue: | |||
430 | /* | 430 | /* |
431 | * Keep counts of non-zero index values: | 431 | * Keep counts of non-zero index values: |
432 | */ | 432 | */ |
433 | qstat_inc(qstat_lock_use_node2 + idx - 1, idx); | 433 | lockevent_cond_inc(lock_use_node2 + idx - 1, idx); |
434 | 434 | ||
435 | /* | 435 | /* |
436 | * Ensure that we increment the head node->count before initialising | 436 | * Ensure that we increment the head node->count before initialising |