diff options
Diffstat (limited to 'kernel/rcu')
-rw-r--r-- | kernel/rcu/rcutorture.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index 4d559baf06e0..f43e3517f5f5 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c | |||
@@ -244,7 +244,7 @@ struct rcu_torture_ops { | |||
244 | int (*readlock)(void); | 244 | int (*readlock)(void); |
245 | void (*read_delay)(struct torture_random_state *rrsp); | 245 | void (*read_delay)(struct torture_random_state *rrsp); |
246 | void (*readunlock)(int idx); | 246 | void (*readunlock)(int idx); |
247 | int (*completed)(void); | 247 | unsigned long (*completed)(void); |
248 | void (*deferred_free)(struct rcu_torture *p); | 248 | void (*deferred_free)(struct rcu_torture *p); |
249 | void (*sync)(void); | 249 | void (*sync)(void); |
250 | void (*exp_sync)(void); | 250 | void (*exp_sync)(void); |
@@ -296,7 +296,7 @@ static void rcu_torture_read_unlock(int idx) __releases(RCU) | |||
296 | rcu_read_unlock(); | 296 | rcu_read_unlock(); |
297 | } | 297 | } |
298 | 298 | ||
299 | static int rcu_torture_completed(void) | 299 | static unsigned long rcu_torture_completed(void) |
300 | { | 300 | { |
301 | return rcu_batches_completed(); | 301 | return rcu_batches_completed(); |
302 | } | 302 | } |
@@ -356,7 +356,7 @@ rcu_torture_cb(struct rcu_head *p) | |||
356 | cur_ops->deferred_free(rp); | 356 | cur_ops->deferred_free(rp); |
357 | } | 357 | } |
358 | 358 | ||
359 | static int rcu_no_completed(void) | 359 | static unsigned long rcu_no_completed(void) |
360 | { | 360 | { |
361 | return 0; | 361 | return 0; |
362 | } | 362 | } |
@@ -407,7 +407,7 @@ static void rcu_bh_torture_read_unlock(int idx) __releases(RCU_BH) | |||
407 | rcu_read_unlock_bh(); | 407 | rcu_read_unlock_bh(); |
408 | } | 408 | } |
409 | 409 | ||
410 | static int rcu_bh_torture_completed(void) | 410 | static unsigned long rcu_bh_torture_completed(void) |
411 | { | 411 | { |
412 | return rcu_batches_completed_bh(); | 412 | return rcu_batches_completed_bh(); |
413 | } | 413 | } |
@@ -510,7 +510,7 @@ static void srcu_torture_read_unlock(int idx) __releases(&srcu_ctl) | |||
510 | srcu_read_unlock(&srcu_ctl, idx); | 510 | srcu_read_unlock(&srcu_ctl, idx); |
511 | } | 511 | } |
512 | 512 | ||
513 | static int srcu_torture_completed(void) | 513 | static unsigned long srcu_torture_completed(void) |
514 | { | 514 | { |
515 | return srcu_batches_completed(&srcu_ctl); | 515 | return srcu_batches_completed(&srcu_ctl); |
516 | } | 516 | } |
@@ -1015,8 +1015,8 @@ static void rcutorture_trace_dump(void) | |||
1015 | static void rcu_torture_timer(unsigned long unused) | 1015 | static void rcu_torture_timer(unsigned long unused) |
1016 | { | 1016 | { |
1017 | int idx; | 1017 | int idx; |
1018 | int completed; | 1018 | unsigned long completed; |
1019 | int completed_end; | 1019 | unsigned long completed_end; |
1020 | static DEFINE_TORTURE_RANDOM(rand); | 1020 | static DEFINE_TORTURE_RANDOM(rand); |
1021 | static DEFINE_SPINLOCK(rand_lock); | 1021 | static DEFINE_SPINLOCK(rand_lock); |
1022 | struct rcu_torture *p; | 1022 | struct rcu_torture *p; |
@@ -1073,8 +1073,8 @@ static void rcu_torture_timer(unsigned long unused) | |||
1073 | static int | 1073 | static int |
1074 | rcu_torture_reader(void *arg) | 1074 | rcu_torture_reader(void *arg) |
1075 | { | 1075 | { |
1076 | int completed; | 1076 | unsigned long completed; |
1077 | int completed_end; | 1077 | unsigned long completed_end; |
1078 | int idx; | 1078 | int idx; |
1079 | DEFINE_TORTURE_RANDOM(rand); | 1079 | DEFINE_TORTURE_RANDOM(rand); |
1080 | struct rcu_torture *p; | 1080 | struct rcu_torture *p; |