2 files changed, 8 insertions, 3 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index e0fda156f021..db861d8b6c28 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -699,6 +699,11 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
                 dst_pte = huge_pte_alloc(dst, addr);
                 if (!dst_pte)
                         goto nomem;
+
+                /* If the pagetables are shared don't copy or take references */
+                if (dst_pte == src_pte)
+                        continue;
+
                 spin_lock(&dst->page_table_lock);
                 spin_lock(&src->page_table_lock);
                 if (!pte_none(*src_pte)) {
diff --git a/mm/slab.c b/mm/slab.c
index aebb9f68557a..b03b2e46b806 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1590,7 +1590,7 @@ void __init kmem_cache_init(void)
                 /* Replace the static kmem_list3 structures for the boot cpu */
                 init_list(&cache_cache, &initkmem_list3[CACHE_CACHE], node);
 
-                for_each_node_state(nid, N_NORMAL_MEMORY) {
+                for_each_online_node(nid) {
                         init_list(malloc_sizes[INDEX_AC].cs_cachep,
                                   &initkmem_list3[SIZE_AC + nid], nid);
 
@@ -1968,7 +1968,7 @@ static void __init set_up_list3s(struct kmem_cache *cachep, int index)
 {
         int node;
 
-        for_each_node_state(node, N_NORMAL_MEMORY) {
+        for_each_online_node(node) {
                 cachep->nodelists[node] = &initkmem_list3[index + node];
                 cachep->nodelists[node]->next_reap = jiffies +
                     REAPTIMEOUT_LIST3 +
@@ -3815,7 +3815,7 @@ static int alloc_kmemlist(struct kmem_cache *cachep)
         struct array_cache *new_shared;
         struct array_cache **new_alien = NULL;
 
-        for_each_node_state(node, N_NORMAL_MEMORY) {
+        for_each_online_node(node) {
 
                 if (use_alien_caches) {
                         new_alien = alloc_alien_cache(node, cachep->limit);