From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757315AbbCEPoy (ORCPT ); Thu, 5 Mar 2015 10:44:54 -0500 Received: from g2t2354.austin.hp.com ([15.217.128.53]:49766 "EHLO g2t2354.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757279AbbCEPov (ORCPT ); Thu, 5 Mar 2015 10:44:51 -0500 From: Toshi Kani To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, kbuild-all@01.org, sfr@canb.auug.org.au, fengguang.wu@intel.com, hannes@cmpxchg.org, Toshi Kani Subject: [PATCH] Fix undefined ioremap_huge_init when CONFIG_MMU is not set Date: Thu, 5 Mar 2015 08:44:06 -0700 Message-Id: <1425570246-812-1-git-send-email-toshi.kani@hp.com> X-Mailer: git-send-email 1.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 */