diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 12:37:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 12:37:13 -0700 |
commit | 1f1e2ce8a55bac60ff165d353c6b882e750c9092 (patch) | |
tree | b11aaa5baa04ea5ea0ecc549fa1c95430919cd82 /Documentation/cpusets.txt | |
parent | e570dc2a503f8334b700e8483082c675394f53fd (diff) | |
parent | 9c106c119ebedf624fbd682fd2a4d52e3c8c1a67 (diff) | |
download | op-kernel-dev-1f1e2ce8a55bac60ff165d353c6b882e750c9092.zip op-kernel-dev-1f1e2ce8a55bac60ff165d353c6b882e750c9092.tar.gz |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression
rcupreempt: remove export of rcu_batches_completed_bh
cpuset: limit the input of cpuset.sched_relax_domain_level
Diffstat (limited to 'Documentation/cpusets.txt')
-rw-r--r-- | Documentation/cpusets.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/cpusets.txt b/Documentation/cpusets.txt index d803c5c..353504d 100644 --- a/Documentation/cpusets.txt +++ b/Documentation/cpusets.txt @@ -542,7 +542,7 @@ otherwise initial value -1 that indicates the cpuset has no request. 2 : search cores in a package. 3 : search cpus in a node [= system wide on non-NUMA system] ( 4 : search nodes in a chunk of node [on NUMA system] ) - ( 5~ : search system wide [on NUMA system]) + ( 5 : search system wide [on NUMA system] ) This file is per-cpuset and affect the sched domain where the cpuset belongs to. Therefore if the flag 'sched_load_balance' of a cpuset |