@@ -334,6 +334,7 @@ CONFIG_ARCH_TEGRA_124_SOC=y
CONFIG_ARCH_TEGRA_2x_SOC=y
CONFIG_ARCH_TEGRA_3x_SOC=y
# CONFIG_ARCH_U8500 is not set
+CONFIG_ARCH_USES_NUMA_PROT_NONE=y
CONFIG_ARCH_USES_PG_UNCACHED=y
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
@@ -4599,7 +4600,8 @@ CONFIG_NTB_NETDEV=m
# CONFIG_NTFS_DEBUG is not set
CONFIG_NTFS_FS=m
# CONFIG_NTFS_RW is not set
-# CONFIG_NUMA_BALANCING is not set
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
# CONFIG_NUMA_EMU is not set
CONFIG_NVEC_PAZ00=m
CONFIG_NVEC_POWER=m
This reverts commit c68375ad13b90e33dcf9d5008957ecd0e9d2c331. We can reenable NUMA balancing again, now that _PAGE_NUMA is no longer aliased to _PAGE_PROTNONE which was causing issues with the PTE offset inversion introduced by the L1TF patches. CVE-2018-3620 CVE-2018-3646 Signed-off-by: Juerg Haefliger <juergh@canonical.com> --- debian.master/config/config.common.ubuntu | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)