diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
| commit | ea2aca084ba82aaf7c148d04914ceed8758ce08a (patch) | |
| tree | dcb3f4f849cf48deac2dd3bafd5c2cd2f0e7dc79 /Documentation/cpusets.txt | |
| parent | f3032be921cd126615ce3bfd7084e3d319f3f892 (diff) | |
| parent | c5a78ac00c400df29645e59938700301efb371d0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wan/hdlc_fr.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
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 d803c5c68ab..353504de308 100644 --- a/Documentation/cpusets.txt +++ b/Documentation/cpusets.txt | |||
| @@ -542,7 +542,7 @@ otherwise initial value -1 that indicates the cpuset has no request. | |||
| 542 | 2 : search cores in a package. | 542 | 2 : search cores in a package. |
| 543 | 3 : search cpus in a node [= system wide on non-NUMA system] | 543 | 3 : search cpus in a node [= system wide on non-NUMA system] |
| 544 | ( 4 : search nodes in a chunk of node [on NUMA system] ) | 544 | ( 4 : search nodes in a chunk of node [on NUMA system] ) |
| 545 | ( 5~ : search system wide [on NUMA system]) | 545 | ( 5 : search system wide [on NUMA system] ) |
| 546 | 546 | ||
| 547 | This file is per-cpuset and affect the sched domain where the cpuset | 547 | This file is per-cpuset and affect the sched domain where the cpuset |
| 548 | belongs to. Therefore if the flag 'sched_load_balance' of a cpuset | 548 | belongs to. Therefore if the flag 'sched_load_balance' of a cpuset |