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

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

[akpm]

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

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

------------------------------------------------------
From: Nicholas Piggin <npiggin@gmail.com>
Subject: mm-vmalloc-remove-map_kernel_range-fix-2

This requires a fix for nommu builds.

Link: https://lkml.kernel.org/r/1617292497.o1uhq5ipxp.astroid@bobo.none
Cc: Christoph Hellwig <hch@lst.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/internal.h |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- a/mm/internal.h~mm-vmalloc-remove-map_kernel_range-fix-2
+++ a/mm/internal.h
@@ -643,8 +643,18 @@ struct migration_target_control {
 /*
  * mm/vmalloc.c
  */
+#ifdef CONFIG_MMU
 int vmap_pages_range_noflush(unsigned long addr, unsigned long end,
                 pgprot_t prot, struct page **pages, unsigned int page_shift);
+#else
+static inline
+int vmap_pages_range_noflush(unsigned long addr, unsigned long end,
+                pgprot_t prot, struct page **pages, unsigned int page_shift)
+{
+	return -EINVAL;
+}
+#endif
+
 void vunmap_range_noflush(unsigned long start, unsigned long end);
 
 #endif	/* __MM_INTERNAL_H */
_

Patches currently in -mm which might be from npiggin@gmail.com are

arm-mm-add-missing-pud_page-define-to-2-level-page-tables.patch
mm-vmalloc-fix-huge_vmap-regression-by-enabling-huge-pages-in-vmalloc_to_page.patch
mm-apply_to_pte_range-warn-and-fail-if-a-large-pte-is-encountered.patch
mm-vmalloc-rename-vmap__range-vmap_pages__range.patch
mm-ioremap-rename-ioremap__range-to-vmap__range.patch
mm-huge_vmap-arch-support-cleanup.patch
powerpc-inline-huge-vmap-supported-functions.patch
arm64-inline-huge-vmap-supported-functions.patch
x86-inline-huge-vmap-supported-functions.patch
mm-vmalloc-provide-fallback-arch-huge-vmap-support-functions.patch
mm-move-vmap_range-from-mm-ioremapc-to-mm-vmallocc.patch
mm-vmalloc-add-vmap_range_noflush-variant.patch
mm-vmalloc-hugepage-vmalloc-mappings.patch
mm-vmalloc-remove-map_kernel_range.patch
kernel-dma-remove-unnecessary-unmap_kernel_range.patch
powerpc-xive-remove-unnecessary-unmap_kernel_range.patch
mm-vmalloc-remove-unmap_kernel_range.patch
mm-vmalloc-improve-allocation-failure-error-messages.patch