1 files changed, 8 insertions, 5 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index 131f2938f3ad..855b93b3637c 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -971,7 +971,7 @@ static inline int shmem_parse_mpol(char *value, int *policy, nodemask_t *policy_
                 *nodelist++ = '\0';
                 if (nodelist_parse(nodelist, *policy_nodes))
                         goto out;
-                if (!nodes_subset(*policy_nodes, node_online_map))
+                if (!nodes_subset(*policy_nodes, node_states[N_HIGH_MEMORY]))
                         goto out;
         }
         if (!strcmp(value, "default")) {
@@ -996,9 +996,11 @@ static inline int shmem_parse_mpol(char *value, int *policy, nodemask_t *policy_
                         err = 0;
         } else if (!strcmp(value, "interleave")) {
                 *policy = MPOL_INTERLEAVE;
-                /* Default to nodes online if no nodelist */
+                /*
+                 * Default to online nodes with memory if no nodelist
+                 */
                 if (!nodelist)
-                        *policy_nodes = node_online_map;
+                        *policy_nodes = node_states[N_HIGH_MEMORY];
                 err = 0;
         }
 out:
@@ -1060,7 +1062,8 @@ shmem_alloc_page(gfp_t gfp, struct shmem_inode_info *info,
         return page;
 }
 #else
-static inline int shmem_parse_mpol(char *value, int *policy, nodemask_t *policy_nodes)
+static inline int shmem_parse_mpol(char *value, int *policy,
+                                                nodemask_t *policy_nodes)
 {
         return 1;
 }
@@ -2238,7 +2241,7 @@ static int shmem_fill_super(struct super_block *sb,
         unsigned long blocks = 0;
         unsigned long inodes = 0;
         int policy = MPOL_DEFAULT;
-        nodemask_t policy_nodes = node_online_map;
+        nodemask_t policy_nodes = node_states[N_HIGH_MEMORY];
 
 #ifdef CONFIG_TMPFS
         /*