4 files changed, 7 insertions, 3 deletions

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 1850d0aef4ac..b62cab575a84 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -208,6 +208,8 @@ static int check_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
                 page = vm_normal_page(vma, addr, *pte);
                 if (!page)
                         continue;
+                if (PageReserved(page))
+                        continue;
                 nid = page_to_nid(page);
                 if (node_isset(nid, *nodes) == !!(flags & MPOL_MF_INVERT))
                         continue;
@@ -290,7 +292,7 @@ static inline int check_pgd_range(struct vm_area_struct *vma,
 static inline int vma_migratable(struct vm_area_struct *vma)
 {
         if (vma->vm_flags & (
-                VM_LOCKED|VM_IO|VM_HUGETLB|VM_PFNMAP))
+                VM_LOCKED|VM_IO|VM_HUGETLB|VM_PFNMAP|VM_RESERVED))
                 return 0;
         return 1;
 }
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d41a0662d4da..8c960b469593 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1742,7 +1742,7 @@ void __devinit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
         unsigned long end_pfn = start_pfn + size;
         unsigned long pfn;
 
-        for (pfn = start_pfn; pfn < end_pfn; pfn++, page++) {
+        for (pfn = start_pfn; pfn < end_pfn; pfn++) {
                 if (!early_pfn_valid(pfn))
                         continue;
                 page = pfn_to_page(pfn);
diff --git a/mm/swap.c b/mm/swap.c
index ee6d71ccfa56..cbb48e721ab9 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -384,6 +384,8 @@ unsigned pagevec_lookup(struct pagevec *pvec, struct address_space *mapping,
         return pagevec_count(pvec);
 }
 
+EXPORT_SYMBOL(pagevec_lookup);
+
 unsigned pagevec_lookup_tag(struct pagevec *pvec, struct address_space *mapping,
                 pgoff_t *index, int tag, unsigned nr_pages)
 {
diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c
index cdc6d431972b..f9d6a9cc91c4 100644
--- a/mm/tiny-shmem.c
+++ b/mm/tiny-shmem.c
@@ -90,7 +90,7 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
         file->f_mode = FMODE_WRITE | FMODE_READ;
 
         /* notify everyone as to the change of file size */
-        error = do_truncate(dentry, size, file);
+        error = do_truncate(dentry, size, 0, file);
         if (error < 0)
                 goto close_file;