diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 03907f561f70b5397ef6b2b7ee1437b3c242135d..8e9dda5893bfff102af50081be2de34c3320585a 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -9771,8 +9771,8 @@ CONFIG_HZ_200 policy<{'armhf': 'n'}> CONFIG_HZ_500 policy<{'armhf': 'n'}> # Menu: Processor type and features >> Transparent Hugepage Support sysfs defaults -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS policy<{'amd64': 'y', 'arm64': 'y', 'armhf-generic-lpae': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_TRANSPARENT_HUGEPAGE_MADVISE policy<{'amd64': 'n', 'arm64': 'n', 'armhf-generic-lpae': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS policy<{'amd64': 'n', 'arm64': 'n', 'armhf-generic-lpae': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE policy<{'amd64': 'y', 'arm64': 'y', 'armhf-generic-lpae': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> # Menu: Processor type and features >> Tune code generation >> Architecture: s390 CONFIG_TUNE_DEFAULT policy<{'s390x': 'n'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index a09426b4f18ae3dcd93d8ea7286b9c1355005aa2..70e4dd4c9c02d173122e9c3db1944f45da0873a1 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -8035,8 +8035,8 @@ CONFIG_TRACING=y CONFIG_TRACING_EVENTS_GPIO=y CONFIG_TRACING_SUPPORT=y CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TREE_RCU=y # CONFIG_TREE_RCU_TRACE is not set CONFIG_TRUSTED_FOUNDATIONS=y