From ca495e52f64bc260e33c4f38fc0825c96f8c2432 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 20:20:52 -0800 Subject: [PATCH] sys-kernel/coreos-modules: Move some more options to amd64 They require architecture features not available on arm64 as of 4.10. --- .../sys-kernel/coreos-modules/files/amd64_defconfig-4.10 | 2 ++ .../sys-kernel/coreos-modules/files/commonconfig-4.10 | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 index 7bc837a78f..256c42c1f2 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 @@ -160,5 +160,7 @@ CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_ENA_ETHERNET=m +CONFIG_OPTPROBES=y +CONFIG_KPROBES_ON_FTRACE=y CONFIG_FCOE_FNIC=m CONFIG_ISCSI_IBFT_FIND=y diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 index af3179e165..34f3486f85 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 @@ -37,8 +37,6 @@ CONFIG_BPF_SYSCALL=y CONFIG_PROFILING=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y -CONFIG_OPTPROBES=y -CONFIG_KPROBES_ON_FTRACE=y CONFIG_KRETPROBES=y CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_MODULES=y