mempolicy: use N_MEMORY instead N_HIGH_MEMORY

N_HIGH_MEMORY stands for the nodes that has normal or high memory.
N_MEMORY stands for the nodes that has any memory.

The code here need to handle with the nodes which have memory, we should
use N_MEMORY instead.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Hillf Danton <dhillf@gmail.com>
Cc: Lin Feng <linfeng@cn.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 0719e8dd4945..aaf54566cb6b 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -212,9 +212,9 @@ static int mpol_set_nodemask(struct mempolicy *pol,
         /* if mode is MPOL_DEFAULT, pol is NULL. This is right. */
         if (pol == NULL)
                 return 0;
-        /* Check N_HIGH_MEMORY */
+        /* Check N_MEMORY */
         nodes_and(nsc->mask1,
-                  cpuset_current_mems_allowed, node_states[N_HIGH_MEMORY]);
+                  cpuset_current_mems_allowed, node_states[N_MEMORY]);
 
         VM_BUG_ON(!nodes);
         if (pol->mode == MPOL_PREFERRED && nodes_empty(*nodes))
@@ -1388,7 +1388,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
                 goto out_put;
         }
 
-        if (!nodes_subset(*new, node_states[N_HIGH_MEMORY])) {
+        if (!nodes_subset(*new, node_states[N_MEMORY])) {
                 err = -EINVAL;
                 goto out_put;
         }
@@ -2326,7 +2326,7 @@ void __init numa_policy_init(void)
          * fall back to the largest node if they're all smaller.
          */
         nodes_clear(interleave_nodes);
-        for_each_node_state(nid, N_HIGH_MEMORY) {
+        for_each_node_state(nid, N_MEMORY) {
                 unsigned long total_pages = node_present_pages(nid);
 
                 /* Preserve the largest node */
@@ -2407,7 +2407,7 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
                 *nodelist++ = '\0';
                 if (nodelist_parse(nodelist, nodes))
                         goto out;
-                if (!nodes_subset(nodes, node_states[N_HIGH_MEMORY]))
+                if (!nodes_subset(nodes, node_states[N_MEMORY]))
                         goto out;
         } else
                 nodes_clear(nodes);
@@ -2441,7 +2441,7 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
                  * Default to online nodes with memory if no nodelist
                  */
                 if (!nodelist)
-                        nodes = node_states[N_HIGH_MEMORY];
+                        nodes = node_states[N_MEMORY];
                 break;
         case MPOL_LOCAL:
                 /*