Merge remote branch 'origin' into secretlab/next-spi

[safe/jmp/linux-2.6] / Documentation / vm / numa_memory_policy.txt

diff --git a/Documentation/vm/numa_memory_policy.txt b/Documentation/vm/numa_memory_policy.txt
index 6aaaeb3..6690fc3 100644 (file)
--- a/Documentation/vm/numa_memory_policy.txt
+++ b/Documentation/vm/numa_memory_policy.txt
@@ -8,7 +8,8 @@ The current memory policy support was added to Linux 2.6 around May 2004.  This
 document attempts to describe the concepts and APIs of the 2.6 memory policy
 support.
 
-Memory policies should not be confused with cpusets (Documentation/cpusets.txt)
+Memory policies should not be confused with cpusets
+(Documentation/cgroups/cpusets.txt)
 which is an administrative mechanism for restricting the nodes from which
 memory may be allocated by a set of processes. Memory policies are a
 programming interface that a NUMA-aware application can take advantage of.  When
@@ -44,7 +45,7 @@ most general to most specific:
        to establish the task policy for a child task exec()'d from an
        executable image that has no awareness of memory policy.  See the
        MEMORY POLICY APIS section, below, for an overview of the system call
-       that a task may use to set/change it's task/process policy.
+       that a task may use to set/change its task/process policy.
 
        In a multi-threaded task, task policies apply only to the thread
        [Linux kernel task] that installs the policy and any threads
@@ -300,7 +301,7 @@ decrement this reference count, respectively.  mpol_put() will only free
 the structure back to the mempolicy kmem cache when the reference count
 goes to zero.
 
-When a new memory policy is allocated, it's reference count is initialized
+When a new memory policy is allocated, its reference count is initialized
 to '1', representing the reference held by the task that is installing the
 new policy.  When a pointer to a memory policy structure is stored in another
 structure, another reference is added, as the task's reference will be dropped