6 files changed, 19 insertions, 12 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 5209e47b7f..7c86436300 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -28,6 +28,7 @@
 #include <linux/backing-dev.h>
 #include <linux/pagevec.h>
 #include <linux/blkdev.h>
+#include <linux/backing-dev.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/cpuset.h>
diff --git a/mm/nommu.c b/mm/nommu.c
index 8f09333f78..35622c5909 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -12,6 +12,7 @@
  *  Copyright (c) 2002      Greg Ungerer <gerg@snapgear.com>
  */
 
+#include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
 #include <linux/swap.h>
diff --git a/mm/shmem.c b/mm/shmem.c
index 404e53bb21..253d205914 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -915,6 +915,21 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
         struct inode *inode;
 
         BUG_ON(!PageLocked(page));
+        /*
+         * shmem_backing_dev_info's capabilities prevent regular writeback or
+         * sync from ever calling shmem_writepage; but a stacking filesystem
+         * may use the ->writepage of its underlying filesystem, in which case
+         * we want to do nothing when that underlying filesystem is tmpfs
+         * (writing out to swap is useful as a response to memory pressure, but
+         * of no use to stabilize the data) - just redirty the page, unlock it
+         * and claim success in this case.  AOP_WRITEPAGE_ACTIVATE, and the
+         * page_mapped check below, must be avoided unless we're in reclaim.
+         */
+        if (!wbc->for_reclaim) {
+                set_page_dirty(page);
+                unlock_page(page);
+                return 0;
+        }
         BUG_ON(page_mapped(page));
 
         mapping = page->mapping;
diff --git a/mm/slub.c b/mm/slub.c
index aac1dd3c65..bcdb2c8941 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2734,7 +2734,7 @@ static void slab_mem_offline_callback(void *arg)
                          * and offline_pages() function shoudn't call this
                          * callback. So, we must fail.
                          */
-                        BUG_ON(atomic_read(&n->nr_slabs));
+                        BUG_ON(atomic_long_read(&n->nr_slabs));
 
                         s->node[offline_node] = NULL;
                         kmem_cache_free(kmalloc_caches, n);
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
index d3b718b0c2..22620f6a97 100644
--- a/mm/sparse-vmemmap.c
+++ b/mm/sparse-vmemmap.c
@@ -24,6 +24,7 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/vmalloc.h>
+#include <linux/sched.h>
 #include <asm/dma.h>
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
diff --git a/mm/sparse.c b/mm/sparse.c
index 08fb14f5ee..e06f514fe0 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -220,12 +220,6 @@ static int __meminit sparse_init_one_section(struct mem_section *ms,
         return 1;
 }
 
-__attribute__((weak)) __init
-void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size)
-{
-        return NULL;
-}
-
 static unsigned long usemap_size(void)
 {
         unsigned long size_bytes;
@@ -267,11 +261,6 @@ struct page __init *sparse_mem_map_populate(unsigned long pnum, int nid)
         if (map)
                 return map;
 
-        map = alloc_bootmem_high_node(NODE_DATA(nid),
-                       sizeof(struct page) * PAGES_PER_SECTION);
-        if (map)
-                return map;
-
         map = alloc_bootmem_node(NODE_DATA(nid),
                         sizeof(struct page) * PAGES_PER_SECTION);
         return map;