From 37b2431ef62981917a841fc079feec2cbe1bbe7a Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Tue, 14 Nov 2017 11:15:10 -0800 Subject: [PATCH] sys-kernel/arm64_defconfig: Remove CONFIG_CMA CONFIG_CMA is really unneeded, and was causing network problems on Cavuim machines due to the default CONFIG_DMA_CMA of 16MiB being too small. Signed-off-by: Geoff Levand --- ...s-kernel-4.14.0-r1.ebuild => coreos-kernel-4.14.0-r2.ebuild} | 0 ...modules-4.14.0-r1.ebuild => coreos-modules-4.14.0-r2.ebuild} | 0 .../sys-kernel/coreos-modules/files/arm64_defconfig-4.14 | 2 -- 3 files changed, 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.14.0-r1.ebuild => coreos-kernel-4.14.0-r2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.14.0-r1.ebuild => coreos-modules-4.14.0-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.0-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.0-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.0-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.0-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.14 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.14 index f89aaf21aa..dbd706dabc 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.14 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.14 @@ -29,7 +29,6 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y CONFIG_ARM64_64K_PAGES=y CONFIG_ARM64_VA_BITS_48=y CONFIG_PREEMPT=y -CONFIG_CMA=y CONFIG_SECCOMP=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_COMPAT=y @@ -40,7 +39,6 @@ CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_IPV4=y CONFIG_BRIDGE=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DMA_CMA=y CONFIG_BLK_DEV_LOOP=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y