| Message ID | 1486133011-5100-2-git-send-email-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 7ff7a36..4f9af6f 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -422,7 +422,6 @@ CONFIG_NO_HZ=y CONFIG_NR_CPUS=512 CONFIG_NTB=m CONFIG_NUMA=y -CONFIG_NUMA_BALANCING=y CONFIG_NVMEM=m CONFIG_NVRAM=m CONFIG_N_GSM=m diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index d0bdc59..f599c59 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -457,7 +457,6 @@ CONFIG_NO_HZ=y CONFIG_NR_CPUS=128 CONFIG_NTB=m CONFIG_NUMA=y -# CONFIG_NUMA_BALANCING is not set CONFIG_NVMEM=m CONFIG_N_GSM=m CONFIG_OF=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 98ed6af..eb43f9e 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5546,6 +5546,7 @@ CONFIG_NTB_TRANSPORT=m CONFIG_NTFS_FS=m # CONFIG_NTFS_RW is not set # CONFIG_NTP_PPS is not set +CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y # CONFIG_NUMA_EMU is not set CONFIG_NVDIMM_DAX=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 34e8589..387e62f 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -393,7 +393,6 @@ CONFIG_NOP_USB_XCEIV=m CONFIG_NOZOMI=m CONFIG_NO_HZ=y CONFIG_NTB=m -CONFIG_NUMA_BALANCING=y CONFIG_NVMEM=m CONFIG_NVRAM=y CONFIG_N_GSM=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index b8ce49b..e9603e8 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -434,7 +434,6 @@ CONFIG_NO_HZ=y CONFIG_NR_CPUS=2048 CONFIG_NTB=m CONFIG_NUMA=y -CONFIG_NUMA_BALANCING=y CONFIG_NVMEM=m CONFIG_N_GSM=m CONFIG_OF=y
Make CONFIG_NUMA_BALANCING consistent with Xenial and the annotations file preperatory to setting CONFIG_NUMA_EMU=y for s390x. BugLink: http://bugs.launchpad.net/bugs/1557690 Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/ppc64el/config.common.ppc64el | 1 - 5 files changed, 1 insertion(+), 4 deletions(-)