[folded-merged] mm-vmalloc-remove-unmap_kernel_range-fix-fix.patch removed from -mm tree

[folded-merged] mm-vmalloc-remove-unmap_kernel_range-fix-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm-vmalloc-remove-unmap_kernel_range-fix-fix
has been removed from the -mm tree.  Its filename was
     mm-vmalloc-remove-unmap_kernel_range-fix-fix.patch

This patch was dropped because it was folded into mm-vmalloc-remove-unmap_kernel_range.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-vmalloc-remove-unmap_kernel_range-fix-fix

move vunmap_range_noflush() stub inside !CONFIG_MMU, not !CONFIG_NUMA

Cc: Christoph Hellwig <hch@lst.de>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/internal.h |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- a/mm/internal.h~mm-vmalloc-remove-unmap_kernel_range-fix-fix
+++ a/mm/internal.h
@@ -447,7 +447,9 @@ static inline struct file *maybe_unlock_
 static inline void clear_page_mlock(struct page *page) { }
 static inline void mlock_vma_page(struct page *page) { }
 static inline void mlock_migrate_page(struct page *new, struct page *old) { }
-
+static inline void vunmap_range_noflush(unsigned long start, unsigned long end)
+{
+}
 #endif /* !CONFIG_MMU */
 
 /*
@@ -541,9 +543,6 @@ static inline int node_reclaim(struct pg
 {
 	return NODE_RECLAIM_NOSCAN;
 }
-static inline void vunmap_range_noflush(unsigned long start, unsigned long end)
-{
-}
 #endif
 
 extern int hwpoison_filter(struct page *p);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-vmalloc-remove-unmap_kernel_range.patch
mm-page_alloc-add-an-array-based-interface-to-the-bulk-page-allocator-fix.patch
mm.patch
mm-vmscan-add-shrinker_info_protected-helper-fix.patch
mm-drop-redundant-arch_enable__migration-fix.patch
mm-drop-redundant-arch_enable__migration-fix-fix.patch
kernel-resource-allow-region_intersects-users-to-hold-resource_lock-fix.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
cifsd-is-broken.patch
kernel-forkc-export-kernel_thread-to-modules.patch