diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-04-01 11:42:27 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-05-27 15:59:57 -0400 |
commit | 61d49d2f9888ace06ab127cf6f063bed7c3b2e53 (patch) | |
tree | dd1cb27eeff0440a08b15887b181f469abcb458d | |
parent | 3838cc1850ccd09f93e729e9047ec1995026f83e (diff) |
locktorture: Change longdelay_us to longdelay_ms
The locktorture long delays are in milliseconds rather than microseconds,
so this commit changes the name of the corresponding variable from
longdelay_us to longdelay_ms.
Reported-by: Ben Goodwyn <bgoodwyn@softnas.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
-rw-r--r-- | kernel/locking/locktorture.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c index 6a2723c88c33..32244186f1f2 100644 --- a/kernel/locking/locktorture.c +++ b/kernel/locking/locktorture.c | |||
@@ -122,12 +122,12 @@ static int torture_lock_busted_write_lock(void) | |||
122 | 122 | ||
123 | static void torture_lock_busted_write_delay(struct torture_random_state *trsp) | 123 | static void torture_lock_busted_write_delay(struct torture_random_state *trsp) |
124 | { | 124 | { |
125 | const unsigned long longdelay_us = 100; | 125 | const unsigned long longdelay_ms = 100; |
126 | 126 | ||
127 | /* We want a long delay occasionally to force massive contention. */ | 127 | /* We want a long delay occasionally to force massive contention. */ |
128 | if (!(torture_random(trsp) % | 128 | if (!(torture_random(trsp) % |
129 | (cxt.nrealwriters_stress * 2000 * longdelay_us))) | 129 | (cxt.nrealwriters_stress * 2000 * longdelay_ms))) |
130 | mdelay(longdelay_us); | 130 | mdelay(longdelay_ms); |
131 | #ifdef CONFIG_PREEMPT | 131 | #ifdef CONFIG_PREEMPT |
132 | if (!(torture_random(trsp) % (cxt.nrealwriters_stress * 20000))) | 132 | if (!(torture_random(trsp) % (cxt.nrealwriters_stress * 20000))) |
133 | preempt_schedule(); /* Allow test to be preempted. */ | 133 | preempt_schedule(); /* Allow test to be preempted. */ |
@@ -160,14 +160,14 @@ static int torture_spin_lock_write_lock(void) __acquires(torture_spinlock) | |||
160 | static void torture_spin_lock_write_delay(struct torture_random_state *trsp) | 160 | static void torture_spin_lock_write_delay(struct torture_random_state *trsp) |
161 | { | 161 | { |
162 | const unsigned long shortdelay_us = 2; | 162 | const unsigned long shortdelay_us = 2; |
163 | const unsigned long longdelay_us = 100; | 163 | const unsigned long longdelay_ms = 100; |
164 | 164 | ||
165 | /* We want a short delay mostly to emulate likely code, and | 165 | /* We want a short delay mostly to emulate likely code, and |
166 | * we want a long delay occasionally to force massive contention. | 166 | * we want a long delay occasionally to force massive contention. |
167 | */ | 167 | */ |
168 | if (!(torture_random(trsp) % | 168 | if (!(torture_random(trsp) % |
169 | (cxt.nrealwriters_stress * 2000 * longdelay_us))) | 169 | (cxt.nrealwriters_stress * 2000 * longdelay_ms))) |
170 | mdelay(longdelay_us); | 170 | mdelay(longdelay_ms); |
171 | if (!(torture_random(trsp) % | 171 | if (!(torture_random(trsp) % |
172 | (cxt.nrealwriters_stress * 2 * shortdelay_us))) | 172 | (cxt.nrealwriters_stress * 2 * shortdelay_us))) |
173 | udelay(shortdelay_us); | 173 | udelay(shortdelay_us); |