diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
| commit | 525352eb6d355bef6adf597252fc6d04f2dbe66c (patch) | |
| tree | 4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /kernel/rcutorture.c | |
| parent | d51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff) | |
| parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'kernel/rcutorture.c')
| -rw-r--r-- | kernel/rcutorture.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c index 88c28d476550..49fbbeff201c 100644 --- a/kernel/rcutorture.c +++ b/kernel/rcutorture.c | |||
| @@ -409,9 +409,8 @@ rcu_torture_cleanup(void) | |||
| 409 | stats_task = NULL; | 409 | stats_task = NULL; |
| 410 | 410 | ||
| 411 | /* Wait for all RCU callbacks to fire. */ | 411 | /* Wait for all RCU callbacks to fire. */ |
| 412 | rcu_barrier(); | ||
| 412 | 413 | ||
| 413 | for (i = 0; i < RCU_TORTURE_PIPE_LEN; i++) | ||
| 414 | synchronize_rcu(); | ||
| 415 | rcu_torture_stats_print(); /* -After- the stats thread is stopped! */ | 414 | rcu_torture_stats_print(); /* -After- the stats thread is stopped! */ |
| 416 | printk(KERN_ALERT TORTURE_FLAG | 415 | printk(KERN_ALERT TORTURE_FLAG |
| 417 | "--- End of test: %s\n", | 416 | "--- End of test: %s\n", |