Skip to content

Commit 1fe6807

Browse files
authored
Merge pull request #3685 from tidusete/fix/1974-enable-function-tracer
sys-kernel/coreos-modules: arm64: Enable CONFIG_FUNCTION_TRACER & CONFIG_DYNAMIC_FTRACE
2 parents e749331 + f15a0fa commit 1fe6807

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- 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))

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ CONFIG_DRM_VIRTIO_GPU=m
178178
CONFIG_DST_CACHE=y
179179
CONFIG_DUMMY=m
180180
CONFIG_DYNAMIC_DEBUG=y
181+
CONFIG_DYNAMIC_FTRACE=y
181182
CONFIG_E100=m
182183
CONFIG_E1000=m
183184
CONFIG_E1000E=m
@@ -214,8 +215,9 @@ CONFIG_FSCACHE_STATS=y
214215
CONFIG_FS_DAX=y
215216
CONFIG_FS_ENCRYPTION=y
216217
CONFIG_FTRACE_SYSCALLS=y
217-
CONFIG_FUSE_FS=m
218+
CONFIG_FUNCTION_TRACER=y
218219
CONFIG_FUSE_DAX=y
220+
CONFIG_FUSE_FS=m
219221
CONFIG_FUSION=y
220222
CONFIG_FUSION_CTL=m
221223
CONFIG_FUSION_LOGGING=y
@@ -1007,12 +1009,12 @@ CONFIG_VIA_RHINE_MMIO=y
10071009
CONFIG_VIRTIO_BALLOON=m
10081010
CONFIG_VIRTIO_BLK=m
10091011
CONFIG_VIRTIO_CONSOLE=m
1012+
CONFIG_VIRTIO_FS=m
10101013
CONFIG_VIRTIO_INPUT=m
10111014
CONFIG_VIRTIO_MMIO=y
10121015
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
10131016
CONFIG_VIRTIO_NET=m
10141017
CONFIG_VIRTIO_PCI=y
1015-
CONFIG_VIRTIO_FS=m
10161018
CONFIG_VIRTIO_VSOCKETS=m
10171019
CONFIG_VIRT_DRIVERS=y
10181020
CONFIG_VLAN_8021Q=m

0 commit comments

Comments
 (0)