[SRU][U/raspi][H/raspi][PATCH v2 1/1] UBUNTU: [Config] raspi: Set HUGETLBFS=y

[Juerg Haefliger]

BugLink: https://bugs.launchpad.net/bugs/1933627

Enable HUGETLBFS to make full use of huge pages. Also enable the cgroups
controller to match the master kernel.

Signed-off-by: Juerg Haefliger <juergh at canonical.com>
---
 debian.raspi/config/annotations          | 3 +++
 debian.raspi/config/config.common.ubuntu | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations
index 0fe025da7e0b..42a9e3ecad16 100644
--- a/debian.raspi/config/annotations
+++ b/debian.raspi/config/annotations
@@ -4,6 +4,9 @@
 
 include "../../debian.master/config/annotations"
 
+CONFIG_HUGETLBFS				policy<{'arm64': 'y', 'armhf': 'y', 'armhf-raspi-nolpae': '-'}> mark<ENFORCED> note<LP: #1933627>
+CONFIG_CGROUP_HUGETLB				policy<{'arm64': 'y', 'armhf': 'y', 'armhf-raspi-nolpae': '-'}> mark<ENFORCED> note<LP: #1933627>
+
 CONFIG_MFD_TPS65217				policy<{'*': 'm'}> mark<ENFORCED> note<not a boot essential for raspi>
 CONFIG_SAMPLE_TRACE_PRINTK			policy<{'*': '-'}> mark<ENFORCED> note<not available due to SAMPLES=n>
 
diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu
index 07a778fed129..91f7755ed474 100644
--- a/debian.raspi/config/config.common.ubuntu
+++ b/debian.raspi/config/config.common.ubuntu
@@ -215,6 +215,7 @@ CONFIG_ARCH_BINFMT_ELF_STATE=y
 # CONFIG_ARCH_DIGICOLOR is not set
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 # CONFIG_ARCH_DOVE is not set
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
@@ -1149,6 +1150,7 @@ CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
@@ -2992,7 +2994,8 @@ CONFIG_HTS221=m
 CONFIG_HTS221_I2C=m
 CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
-# CONFIG_HUGETLBFS is not set
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
 # CONFIG_HVC_DCC is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_HWLAT_TRACER=y
-- 
2.27.0