lkml.org 
[lkml]   [2019]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 16/27] powerpc/mm: move hugetlb_disabled into asm/hugetlb.h
    Date
    No need to have this in asm/page.h, move it into asm/hugetlb.h

    Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
    ---
    arch/powerpc/include/asm/hugetlb.h | 2 ++
    arch/powerpc/include/asm/page.h | 1 -
    arch/powerpc/kernel/fadump.c | 1 +
    arch/powerpc/mm/hash_utils_64.c | 1 +
    4 files changed, 4 insertions(+), 1 deletion(-)

    diff --git a/arch/powerpc/include/asm/hugetlb.h b/arch/powerpc/include/asm/hugetlb.h
    index fd5c0873a57d..84598c6b0959 100644
    --- a/arch/powerpc/include/asm/hugetlb.h
    +++ b/arch/powerpc/include/asm/hugetlb.h
    @@ -13,6 +13,8 @@
    #include <asm/nohash/32/hugetlb-8xx.h>
    #endif /* CONFIG_PPC_BOOK3S_64 */

    +extern bool hugetlb_disabled;
    +
    void flush_dcache_icache_hugepage(struct page *page);

    int slice_is_hugepage_only_range(struct mm_struct *mm, unsigned long addr,
    diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
    index ed870468ef6f..0c11a7513919 100644
    --- a/arch/powerpc/include/asm/page.h
    +++ b/arch/powerpc/include/asm/page.h
    @@ -29,7 +29,6 @@

    #ifndef __ASSEMBLY__
    #ifdef CONFIG_HUGETLB_PAGE
    -extern bool hugetlb_disabled;
    extern unsigned int HPAGE_SHIFT;
    #else
    #define HPAGE_SHIFT PAGE_SHIFT
    diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
    index 45a8d0be1c96..25f063f56ec5 100644
    --- a/arch/powerpc/kernel/fadump.c
    +++ b/arch/powerpc/kernel/fadump.c
    @@ -36,6 +36,7 @@
    #include <linux/sysfs.h>
    #include <linux/slab.h>
    #include <linux/cma.h>
    +#include <linux/hugetlb.h>

    #include <asm/debugfs.h>
    #include <asm/page.h>
    diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
    index 0a4f939a8161..16ce13af6b9c 100644
    --- a/arch/powerpc/mm/hash_utils_64.c
    +++ b/arch/powerpc/mm/hash_utils_64.c
    @@ -37,6 +37,7 @@
    #include <linux/context_tracking.h>
    #include <linux/libfdt.h>
    #include <linux/pkeys.h>
    +#include <linux/hugetlb.h>

    #include <asm/debugfs.h>
    #include <asm/processor.h>
    --
    2.13.3
    \
     
     \ /
      Last update: 2019-03-20 11:08    [W:4.068 / U:0.864 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site