diff --git a/[refs] b/[refs] index 4072680ca072..225ce71b58d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b97c74bddce4e2c6fef6b3b58910b4fd9eb7f3b8 +refs/heads/master: 0b720378d05d9f5101dd331d16a0957a764583f3 diff --git a/trunk/Documentation/cpusets.txt b/trunk/Documentation/cpusets.txt index 43db6fe12814..ad2bb3b3acc1 100644 --- a/trunk/Documentation/cpusets.txt +++ b/trunk/Documentation/cpusets.txt @@ -209,7 +209,7 @@ and name space for cpusets, with a minimum of additional kernel code. The cpus and mems files in the root (top_cpuset) cpuset are read-only. The cpus file automatically tracks the value of cpu_online_map using a CPU hotplug notifier, and the mems file -automatically tracks the value of node_states[N_MEMORY]--i.e., +automatically tracks the value of node_states[N_HIGH_MEMORY]--i.e., nodes with memory--using the cpuset_track_online_nodes() hook.