lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 5 Mar 2015 09:40:07 -0700 From: Toshi Kani <toshi.kani@...com> To: akpm@...ux-foundation.org Cc: linux-mm@...ck.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, kbuild-all@...org, fengguang.wu@...el.com, hannes@...xchg.org, Toshi Kani <toshi.kani@...com> Subject: [PATCH] Fix build errors in asm-generic/pgtable.h 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 <toshi.kani@...com> --- 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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists