diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2020-08-01 16:29:24 +0300 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2020-08-01 14:33:46 +0100 |
| commit | 5c3e83fa881a081d0368cf3933b30a38519aaafd (patch) | |
| tree | edac98c2025020bf5b7971449a80580d92129645 | |
| parent | 1bff9f5b78f8a662f4ea6707e176ffb023cab0a3 (diff) | |
| download | upstream-5c3e83fa881a081d0368cf3933b30a38519aaafd.tar.gz upstream-5c3e83fa881a081d0368cf3933b30a38519aaafd.tar.bz2 upstream-5c3e83fa881a081d0368cf3933b30a38519aaafd.zip | |
kernel: fix missing TRANSPARENT_HUGEPAGE symbols
Enabling KERNEL_TRANSPARENT_HUGEPAGE exposes 2 missing symbols:
* CONFIG_READ_ONLY_THP_FOR_FS
* TRANSPARENT_HUGEPAGE_ALWAYS
* TRANSPARENT_HUGEPAGE_MADVISE
The first one was added in 5.4, and is marked experimental there so just
disable it in the generic config.
For the latter two, we should not force the user to use either of them,
so add them as build-configurable kernel options.
Fixes: d1a8217d87bf ("kernel: clean-up build-configurable kernel config symbols")
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
| -rw-r--r-- | config/Config-kernel.in | 12 | ||||
| -rw-r--r-- | target/linux/generic/config-5.4 | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/config/Config-kernel.in b/config/Config-kernel.in index fa4c8257b2..2e80c8f537 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -360,6 +360,18 @@ config KERNEL_BLK_DEV_BSG config KERNEL_TRANSPARENT_HUGEPAGE bool +choice + prompt "Transparent Hugepage Support sysfs defaults" + depends on KERNEL_TRANSPARENT_HUGEPAGE + default KERNEL_TRANSPARENT_HUGEPAGE_ALWAYS + + config KERNEL_TRANSPARENT_HUGEPAGE_ALWAYS + bool "always" + + config KERNEL_TRANSPARENT_HUGEPAGE_MADVISE + bool "madvise" +endchoice + config KERNEL_HUGETLBFS bool diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index 22d0594e93..6e49ceefca 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -4211,6 +4211,7 @@ CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3 # CONFIG_RD_LZO is not set # CONFIG_RD_XZ is not set # CONFIG_READABLE_ASM is not set +# CONFIG_READ_ONLY_THP_FOR_FS is not set # CONFIG_REALTEK_PHY is not set # CONFIG_REDWOOD is not set # CONFIG_REED_SOLOMON_TEST is not set |