The patch titled
Subject: Fix undefined ioremap_huge_init when CONFIG_MMU is not set
has been removed from the -mm tree. Its filename was
lib-add-huge-i-o-map-capability-interfaces-fix.patch
This patch was dropped because it was folded into lib-add-huge-i-o-map-capability-interfaces.patch
------------------------------------------------------
From: Toshi Kani <toshi.kani@xxxxxx>
Subject: Fix undefined ioremap_huge_init when CONFIG_MMU is not set
Fix a build error, undefined reference to ioremap_huge_init, when
CONFIG_MMU is not defined on linux-next and -mm tree.
lib/ioremap.o is not linked to the kernel when CONFIG_MMU is not
defined.
Signed-off-by: Toshi Kani <toshi.kani@xxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Fengguang Wu <fengguang.wu@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/io.h | 5 +++--
lib/ioremap.c | 1 -
2 files changed, 3 insertions(+), 3 deletions(-)
diff -puN include/linux/io.h~lib-add-huge-i-o-map-capability-interfaces-fix include/linux/io.h
--- a/include/linux/io.h~lib-add-huge-i-o-map-capability-interfaces-fix
+++ a/include/linux/io.h
@@ -38,11 +38,12 @@ static inline int ioremap_page_range(uns
}
#endif
-void __init ioremap_huge_init(void);
-
#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
+void __init ioremap_huge_init(void);
int arch_ioremap_pud_supported(void);
int arch_ioremap_pmd_supported(void);
+#else
+static inline void ioremap_huge_init(void) { }
#endif
/*
diff -puN lib/ioremap.c~lib-add-huge-i-o-map-capability-interfaces-fix lib/ioremap.c
--- a/lib/ioremap.c~lib-add-huge-i-o-map-capability-interfaces-fix
+++ a/lib/ioremap.c
@@ -46,7 +46,6 @@ static inline int ioremap_pmd_enabled(vo
}
#else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */
-void __init ioremap_huge_init(void) { }
static inline int ioremap_pud_enabled(void) { return 0; }
static inline int ioremap_pmd_enabled(void) { return 0; }
#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */
_
Patches currently in -mm which might be from toshi.kani@xxxxxx are
origin.patch
mm-change-__get_vm_area_node-to-use-fls_long.patch
lib-add-huge-i-o-map-capability-interfaces.patch
mm-change-ioremap-to-set-up-huge-i-o-mappings.patch
mm-change-ioremap-to-set-up-huge-i-o-mappings-fix.patch
mm-change-vunmap-to-tear-down-huge-kva-mappings.patch
mm-change-vunmap-to-tear-down-huge-kva-mappings-fix.patch
x86-mm-support-huge-i-o-mapping-capability-i-f.patch
x86-mm-support-huge-kva-mappings-on-x86.patch
x86-mm-support-huge-kva-mappings-on-x86-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
