diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2018-07-13 01:42:41 +0300 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2018-07-13 01:42:41 +0300 |
commit | 18952651dae8efcc6d565c97f8fe5629b399cb3e (patch) | |
tree | e5ed87924a629e849a9cc7c59a185f81ce5c0745 /Documentation | |
parent | c7cd161ecb2188c07ba9560ca82aee756575359f (diff) | |
parent | bf5b64355a3ce41752856b66c4efad4d7a88e84b (diff) | |
download | linux-18952651dae8efcc6d565c97f8fe5629b399cb3e.tar.xz |
Merge branches 'fixes1.2018.07.12b' and 'torture1.2018.07.12b' into HEAD
fixes1.2018.07.12b: Post-gp_seq miscellaneous fixes
torture1.2018.07.12b: Post-gp_seq torture-test updates
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index efc7aa7a0670..77bd3e635313 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3632,8 +3632,8 @@ Set time (s) after boot for CPU-hotplug testing. rcutorture.onoff_interval= [KNL] - Set time (s) between CPU-hotplug operations, or - zero to disable CPU-hotplug testing. + Set time (jiffies) between CPU-hotplug operations, + or zero to disable CPU-hotplug testing. rcutorture.shuffle_interval= [KNL] Set task-shuffle interval (s). Shuffling tasks |