diff options
Diffstat (limited to 'kernel/locking/test-ww_mutex.c')
-rw-r--r-- | kernel/locking/test-ww_mutex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/locking/test-ww_mutex.c b/kernel/locking/test-ww_mutex.c index da6c9a34f62f..6b7abb334ca6 100644 --- a/kernel/locking/test-ww_mutex.c +++ b/kernel/locking/test-ww_mutex.c | |||
@@ -50,7 +50,7 @@ static void test_mutex_work(struct work_struct *work) | |||
50 | 50 | ||
51 | if (mtx->flags & TEST_MTX_TRY) { | 51 | if (mtx->flags & TEST_MTX_TRY) { |
52 | while (!ww_mutex_trylock(&mtx->mutex)) | 52 | while (!ww_mutex_trylock(&mtx->mutex)) |
53 | cpu_relax(); | 53 | cond_resched(); |
54 | } else { | 54 | } else { |
55 | ww_mutex_lock(&mtx->mutex, NULL); | 55 | ww_mutex_lock(&mtx->mutex, NULL); |
56 | } | 56 | } |
@@ -88,7 +88,7 @@ static int __test_mutex(unsigned int flags) | |||
88 | ret = -EINVAL; | 88 | ret = -EINVAL; |
89 | break; | 89 | break; |
90 | } | 90 | } |
91 | cpu_relax(); | 91 | cond_resched(); |
92 | } while (time_before(jiffies, timeout)); | 92 | } while (time_before(jiffies, timeout)); |
93 | } else { | 93 | } else { |
94 | ret = wait_for_completion_timeout(&mtx.done, TIMEOUT); | 94 | ret = wait_for_completion_timeout(&mtx.done, TIMEOUT); |
@@ -627,7 +627,7 @@ static int __init test_ww_mutex_init(void) | |||
627 | if (ret) | 627 | if (ret) |
628 | return ret; | 628 | return ret; |
629 | 629 | ||
630 | ret = stress(4096, hweight32(STRESS_ALL)*ncpus, 1<<12, STRESS_ALL); | 630 | ret = stress(4095, hweight32(STRESS_ALL)*ncpus, 1<<12, STRESS_ALL); |
631 | if (ret) | 631 | if (ret) |
632 | return ret; | 632 | return ret; |
633 | 633 | ||