diff --git a/arch/arm64/configs/merge_kirin710_defconfig b/arch/arm64/configs/merge_kirin710_defconfig index f6b104e06..5e62299ca 100644 --- a/arch/arm64/configs/merge_kirin710_defconfig +++ b/arch/arm64/configs/merge_kirin710_defconfig @@ -232,7 +232,9 @@ CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_SYSTEM_DATA_VERIFICATION is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y -# CONFIG_KPROBES is not set +CONFIG_KPROBES=y +CONFIG_HAVE_KPROBES=y +CONFIG_KPROBE_EVENTS=y # CONFIG_JUMP_LABEL is not set # CONFIG_UPROBES is not set # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set @@ -1366,7 +1368,7 @@ CONFIG_OF_NET=y CONFIG_OF_MDIO=y CONFIG_OF_MTD=y CONFIG_OF_RESERVED_MEM=y -# CONFIG_OF_OVERLAY is not set +CONFIG_OF_OVERLAY=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set @@ -5001,7 +5003,6 @@ CONFIG_HAVE_ARM_SMCCC=y # # File systems # -CONFIG_OVERLAY_FS=y CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set