lkml.org 
[lkml]   [2015]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] Fix build errors in asm-generic/pgtable.h
    Date
    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@hp.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 */

    \
     
     \ /
      Last update: 2015-03-05 18:01    [W:2.361 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site