diff options
author | Jonathan Corbet <corbet@lwn.net> | 2016-08-04 17:05:16 -0600 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2016-08-04 17:05:16 -0600 |
commit | 5f7b30cd766d3589a00750d6100f718347d8f495 (patch) | |
tree | d97cb6934284dc98def18ae7daaa819acc2d50ed /Documentation/vm/numa | |
parent | c1ece76719205690f4b448460d9b85c130e8021b (diff) | |
parent | bdf107d87eb8ce1d1313fee40f3de1a1029a3eca (diff) | |
download | lwn-docs-next-merge.tar.gz lwn-docs-next-merge.zip |
Merge branch 'docs-next' into docs-next-mergedocs-next-merge
Fix the Makefile merge conflict.
Diffstat (limited to 'Documentation/vm/numa')
-rw-r--r-- | Documentation/vm/numa | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/vm/numa b/Documentation/vm/numa index ade01274212d..e0b58c0e6b49 100644 --- a/Documentation/vm/numa +++ b/Documentation/vm/numa @@ -63,7 +63,7 @@ nodes. Each emulated node will manage a fraction of the underlying cells' physical memory. NUMA emluation is useful for testing NUMA kernel and application features on non-NUMA platforms, and as a sort of memory resource management mechanism when used together with cpusets. -[see Documentation/cgroups/cpusets.txt] +[see Documentation/cgroup-v1/cpusets.txt] For each node with memory, Linux constructs an independent memory management subsystem, complete with its own free page lists, in-use page lists, usage @@ -113,7 +113,7 @@ allocation behavior using Linux NUMA memory policy. System administrators can restrict the CPUs and nodes' memories that a non- privileged user can specify in the scheduling or NUMA commands and functions -using control groups and CPUsets. [see Documentation/cgroups/cpusets.txt] +using control groups and CPUsets. [see Documentation/cgroup-v1/cpusets.txt] On architectures that do not hide memoryless nodes, Linux will include only zones [nodes] with memory in the zonelists. This means that for a memoryless |