From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755495AbbCEQkw (ORCPT ); Thu, 5 Mar 2015 11:40:52 -0500 Received: from g2t2353.austin.hp.com ([15.217.128.52]:49815 "EHLO g2t2353.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751258AbbCEQku (ORCPT ); Thu, 5 Mar 2015 11:40:50 -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, fengguang.wu@intel.com, hannes@cmpxchg.org, Toshi Kani Subject: [PATCH] Fix build errors in asm-generic/pgtable.h Date: Thu, 5 Mar 2015 09:40:07 -0700 Message-Id: <1425573607-4801-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 build errors in pud_set_huge() and pmd_set_huge() in asm-generic/pgtable.h on some architectures in linux-next and -mm trees. C-stype code needs be used under #ifndef __ASSEMBLY__. Signed-off-by: Toshi Kani --- include/asm-generic/pgtable.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index eaae472..c79eebf 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -697,12 +697,6 @@ static inline int pmd_protnone(pmd_t pmd) #endif /* CONFIG_MMU */ -#endif /* !__ASSEMBLY__ */ - -#ifndef io_remap_pfn_range -#define io_remap_pfn_range remap_pfn_range -#endif - #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot); int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot); @@ -721,4 +715,10 @@ static inline int pud_clear_huge(pud_t *pud) { return 0; } static inline int pmd_clear_huge(pmd_t *pmd) { return 0; } #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ +#endif /* !__ASSEMBLY__ */ + +#ifndef io_remap_pfn_range +#define io_remap_pfn_range remap_pfn_range +#endif + #endif /* _ASM_GENERIC_PGTABLE_H */