| Message ID | 20190409061449.5083-2-alex@ghiti.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Hugetlbfs support for riscv | expand |
On Mon, 08 Apr 2019 23:14:48 PDT (-0700), alex@ghiti.fr wrote: > ARCH_WANT_HUGE_PMD_SHARE config was declared in both architectures: > move this declaration in arch/Kconfig and make those architectures > select it. > > Signed-off-by: Alexandre Ghiti <alex@ghiti.fr> > --- > arch/Kconfig | 3 +++ > arch/arm64/Kconfig | 2 +- > arch/x86/Kconfig | 4 +--- > 3 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/arch/Kconfig b/arch/Kconfig > index 8c858bb133c9..273cefc6b787 100644 > --- a/arch/Kconfig > +++ b/arch/Kconfig > @@ -567,6 +567,9 @@ config HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD > config HAVE_ARCH_HUGE_VMAP > bool > > +config ARCH_WANT_HUGE_PMD_SHARE > + bool > + > config HAVE_ARCH_SOFT_DIRTY > bool > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 870ef86a64ed..8b7870974961 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -68,6 +68,7 @@ config ARM64 > select ARCH_SUPPORTS_NUMA_BALANCING > select ARCH_WANT_COMPAT_IPC_PARSE_VERSION > select ARCH_WANT_FRAME_POINTERS > + select ARCH_WANT_HUGE_PMD_SHARE if ARM64_4K_PAGES || (ARM64_16K_PAGES && !ARM64_VA_BITS_36) > select ARCH_HAS_UBSAN_SANITIZE_ALL > select ARM_AMBA > select ARM_ARCH_TIMER > @@ -885,7 +886,6 @@ config SYS_SUPPORTS_HUGETLBFS > def_bool y > > config ARCH_WANT_HUGE_PMD_SHARE > - def_bool y if ARM64_4K_PAGES || (ARM64_16K_PAGES && !ARM64_VA_BITS_36) > > config ARCH_HAS_CACHE_LINE_SIZE > def_bool y > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 0f2ab09da060..fd5fc2d288be 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -82,6 +82,7 @@ config X86 > select ARCH_USE_QUEUED_SPINLOCKS > select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH > select ARCH_WANTS_DYNAMIC_TASK_STRUCT > + select ARCH_WANT_HUGE_PMD_SHARE > select ARCH_WANTS_THP_SWAP if X86_64 > select BUILDTIME_EXTABLE_SORT > select CLKEVT_I8253 > @@ -298,9 +299,6 @@ config ARCH_HIBERNATION_POSSIBLE > config ARCH_SUSPEND_POSSIBLE > def_bool y > > -config ARCH_WANT_HUGE_PMD_SHARE > - def_bool y > - > config ARCH_WANT_GENERAL_HUGETLB > def_bool y Reviewed-by: Palmer Dabbelt <palmer@sifive.com> Let me know if you want this via my tree, as I'd also like patch 2 which depends on this one. I've tenatively added both to my for-next tree for now.
diff --git a/arch/Kconfig b/arch/Kconfig index 8c858bb133c9..273cefc6b787 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -567,6 +567,9 @@ config HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD config HAVE_ARCH_HUGE_VMAP bool +config ARCH_WANT_HUGE_PMD_SHARE + bool + config HAVE_ARCH_SOFT_DIRTY bool diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 870ef86a64ed..8b7870974961 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -68,6 +68,7 @@ config ARM64 select ARCH_SUPPORTS_NUMA_BALANCING select ARCH_WANT_COMPAT_IPC_PARSE_VERSION select ARCH_WANT_FRAME_POINTERS + select ARCH_WANT_HUGE_PMD_SHARE if ARM64_4K_PAGES || (ARM64_16K_PAGES && !ARM64_VA_BITS_36) select ARCH_HAS_UBSAN_SANITIZE_ALL select ARM_AMBA select ARM_ARCH_TIMER @@ -885,7 +886,6 @@ config SYS_SUPPORTS_HUGETLBFS def_bool y config ARCH_WANT_HUGE_PMD_SHARE - def_bool y if ARM64_4K_PAGES || (ARM64_16K_PAGES && !ARM64_VA_BITS_36) config ARCH_HAS_CACHE_LINE_SIZE def_bool y diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0f2ab09da060..fd5fc2d288be 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -82,6 +82,7 @@ config X86 select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH select ARCH_WANTS_DYNAMIC_TASK_STRUCT + select ARCH_WANT_HUGE_PMD_SHARE select ARCH_WANTS_THP_SWAP if X86_64 select BUILDTIME_EXTABLE_SORT select CLKEVT_I8253 @@ -298,9 +299,6 @@ config ARCH_HIBERNATION_POSSIBLE config ARCH_SUSPEND_POSSIBLE def_bool y -config ARCH_WANT_HUGE_PMD_SHARE - def_bool y - config ARCH_WANT_GENERAL_HUGETLB def_bool y
ARCH_WANT_HUGE_PMD_SHARE config was declared in both architectures: move this declaration in arch/Kconfig and make those architectures select it. Signed-off-by: Alexandre Ghiti <alex@ghiti.fr> --- arch/Kconfig | 3 +++ arch/arm64/Kconfig | 2 +- arch/x86/Kconfig | 4 +--- 3 files changed, 5 insertions(+), 4 deletions(-)