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 <[email protected]> --- include/linux/io.h | 5 +++-- lib/ioremap.c | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/io.h b/include/linux/io.h index 1ce8b4e..4cc299c 100644 --- a/include/linux/io.h +++ b/include/linux/io.h @@ -38,11 +38,12 @@ static inline int ioremap_page_range(unsigned long addr, unsigned long end, } #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 --git a/lib/ioremap.c b/lib/ioremap.c index 3055ada..be24906 100644 --- a/lib/ioremap.c +++ b/lib/ioremap.c @@ -46,7 +46,6 @@ static inline int ioremap_pmd_enabled(void) } #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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
