From 83ce077677a28ab40e5b697db4831e9fafe1bd2e Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 12 Feb 2026 14:56:17 +0100 Subject: [PATCH] Revert "sys-kernel/coreos-modules: arm64: Enable CONFIG_FUNCTION_TRACER & CONFIG_DYNAMIC_FTRACE" This reverts commit 363f2810702b71e17cba5c543dc9568451e0b1a5. This unfortunately breaks the /boot size limit. Signed-off-by: Mathieu Tortuyaux --- changelog/changes/2026-02-4-enable-tracer-on-arm.md | 1 - .../sys-kernel/coreos-modules/files/commonconfig-6.12 | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 changelog/changes/2026-02-4-enable-tracer-on-arm.md diff --git a/changelog/changes/2026-02-4-enable-tracer-on-arm.md b/changelog/changes/2026-02-4-enable-tracer-on-arm.md deleted file mode 100644 index ce1994ee3a..0000000000 --- a/changelog/changes/2026-02-4-enable-tracer-on-arm.md +++ /dev/null @@ -1 +0,0 @@ -- Function tracer (ftrace) enabled in ARM64 builds. (Enables CONFIG_FUNCTION_TRACER & CONFIG_DYNAMIC_FTRACE for observability and security tools) ([flatcar/scripts#3685](https://github.com/flatcar/scripts/pull/3685)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 index f0b681209a..efc937e08b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 @@ -178,7 +178,6 @@ CONFIG_DRM_VIRTIO_GPU=m CONFIG_DST_CACHE=y CONFIG_DUMMY=m CONFIG_DYNAMIC_DEBUG=y -CONFIG_DYNAMIC_FTRACE=y CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m @@ -215,9 +214,8 @@ CONFIG_FSCACHE_STATS=y CONFIG_FS_DAX=y CONFIG_FS_ENCRYPTION=y CONFIG_FTRACE_SYSCALLS=y -CONFIG_FUNCTION_TRACER=y -CONFIG_FUSE_DAX=y CONFIG_FUSE_FS=m +CONFIG_FUSE_DAX=y CONFIG_FUSION=y CONFIG_FUSION_CTL=m CONFIG_FUSION_LOGGING=y @@ -1008,12 +1006,12 @@ CONFIG_VIA_RHINE_MMIO=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_CONSOLE=m -CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRT_DRIVERS=y CONFIG_VLAN_8021Q=m