diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-05 07:56:07 +1100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-05 07:56:07 +1100 |
commit | 5dc31b576746de76dc86ed46fa3e4ec5f5ae504f (patch) | |
tree | 45163f4aca7f060e829983b70f7ccc896323c764 /Documentation | |
parent | d92dd35920d51e1664f902be48e622307098d0d9 (diff) | |
parent | d36b7b9643faca8aab8cee8d824f75c800b337ac (diff) | |
download | linux-5dc31b576746de76dc86ed46fa3e4ec5f5ae504f.tar.gz linux-5dc31b576746de76dc86ed46fa3e4ec5f5ae504f.tar.bz2 linux-5dc31b576746de76dc86ed46fa3e4ec5f5ae504f.zip |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull two small RCU fixlets from Ingo Molnar.
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
rcu: Make rcu_nocb_poll an early_param instead of module_param
rcu: Prevent soft-lockup complaints about no-CBs CPUs
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 363e348bff9b..6c723811c0a0 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2438,7 +2438,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. real-time workloads. It can also improve energy efficiency for asymmetric multiprocessors. - rcu_nocbs_poll [KNL,BOOT] + rcu_nocb_poll [KNL,BOOT] Rather than requiring that offloaded CPUs (specified by rcu_nocbs= above) explicitly awaken the corresponding "rcuoN" kthreads, |