Unverified Commit 89d647a2 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5695 v2 Disable OLK-6.6 configs 

Merge Pull Request from: @ci-robot 
 
PR sync from: Luo Gengkun <luogengkun2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/A4GW5YQV6K7UO72OWBQ7NFDMD4WDU575/ 
v1->v2:
 Remove the disable of CONFIG_PERF_EVENTS_AMD_UNCORE
 Change the way of disable configs

Luo Gengkun (4):
  x86: configs: Disable CRASH_HOTPLUG
  x86: configs: Disable X86_KERNEL_IBT
  x86: configs: Disable PROBE_EVENTS_BTF_ARGS
  arm64: configs: Disable PROBE_EVENTS_BTF_ARGS


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/I9CXSI 
 
Link:https://gitee.com/openeuler/kernel/pulls/5695

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Reviewed-by: default avatarGou Hao <gouhao@uniontech.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 664759fb 94d321b7

arch/arm64/configs/openeuler_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -8084,7 +8084,7 @@ CONFIG_TRACER_SNAPSHOT=y 
CONFIG_BRANCH_PROFILE_NONE=y

# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_PROBE_EVENTS_BTF_ARGS=y

# CONFIG_PROBE_EVENTS_BTF_ARGS is not set

CONFIG_KPROBE_EVENTS=y

# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set

CONFIG_UPROBE_EVENTS=y

arch/x86/configs/openeuler_defconfig

+3 −4
Original line number Diff line number Diff line
@@ -309,8 +309,7 @@ CONFIG_KEXEC_SIG_FORCE=y 
CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y

CONFIG_KEXEC_JUMP=y

CONFIG_CRASH_DUMP=y

CONFIG_CRASH_HOTPLUG=y

CONFIG_CRASH_MAX_MEMORY_RANGES=8192

# CONFIG_CRASH_HOTPLUG is not set

# end of Kexec and crash features

# end of General setup
@@ -475,7 +474,7 @@ CONFIG_X86_PAT=y 
CONFIG_ARCH_USES_PG_UNCACHED=y

CONFIG_X86_UMIP=y

CONFIG_X86_CET=y

CONFIG_X86_KERNEL_IBT=y

# CONFIG_X86_KERNEL_IBT is not set

CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y

CONFIG_X86_INTEL_TSX_MODE_OFF=y

# CONFIG_X86_INTEL_TSX_MODE_ON is not set
@@ -9246,7 +9245,7 @@ CONFIG_TRACER_SNAPSHOT=y 
CONFIG_BRANCH_PROFILE_NONE=y

# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_PROBE_EVENTS_BTF_ARGS=y

# CONFIG_PROBE_EVENTS_BTF_ARGS is not set

CONFIG_KPROBE_EVENTS=y

# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set

CONFIG_UPROBE_EVENTS=y