diff --git a/arch/arm64/configs/davinci_defconfig b/arch/arm64/configs/davinci_defconfig
index 60b7d8884a4751eacd874a73313377da134a7941..258a9840c1695d2e457a1958c881d1b68a791d3f 100644
--- a/arch/arm64/configs/davinci_defconfig
+++ b/arch/arm64/configs/davinci_defconfig
@@ -502,7 +502,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 #
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
-CONFIG_ARM_SDE_INTERFACE=y
+# CONFIG_ARM_SDE_INTERFACE is not set
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
 # CONFIG_FW_CFG_SYSFS is not set
@@ -630,8 +630,6 @@ CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_RSEQ=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_NMI_WATCHDOG=y
-CONFIG_HAVE_HARDLOCKUP_DETECTOR_ARCH=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
@@ -3695,14 +3693,7 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 #
 # Debug Lockups and Hangs
 #
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
-CONFIG_SDEI_WATCHDOG=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
+# CONFIG_SOFTLOCKUP_DETECTOR is not set
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
diff --git a/arch/arm64/configs/mini_defconfig b/arch/arm64/configs/mini_defconfig
index 5cf777f5236805d3985b37be179063052a05f693..9355da22b5ae4145730d4190024ecdaa4ae544cd 100644
--- a/arch/arm64/configs/mini_defconfig
+++ b/arch/arm64/configs/mini_defconfig
@@ -489,7 +489,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 #
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
-CONFIG_ARM_SDE_INTERFACE=y
+# CONFIG_ARM_SDE_INTERFACE is not set
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
 # CONFIG_FW_CFG_SYSFS is not set
@@ -560,8 +560,6 @@ CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_RSEQ=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_NMI_WATCHDOG=y
-CONFIG_HAVE_HARDLOCKUP_DETECTOR_ARCH=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
@@ -3169,15 +3167,7 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 #
 # Debug Lockups and Hangs
 #
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
-CONFIG_SDEI_WATCHDOG=y
-CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
+# CONFIG_SOFTLOCKUP_DETECTOR is not set
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
diff --git a/arch/arm64/kernel/sdei.c b/arch/arm64/kernel/sdei.c
index ecdeb93c9e297d6a7f80ba1f0dfae1d10084c37b..ea94cf8f9dc6d15f58a7c8e298eba6d8bfdecede 100644
--- a/arch/arm64/kernel/sdei.c
+++ b/arch/arm64/kernel/sdei.c
@@ -145,7 +145,6 @@ bool _on_sdei_stack(unsigned long sp, struct stack_info *info)
 
 unsigned long sdei_arch_get_entry_point(int conduit)
 {
-#ifndef CONFIG_ARCH_ASCEND
 	/*
 	 * SDEI works between adjacent exception levels. If we booted at EL1 we
 	 * assume a hypervisor is marshalling events. If we booted at EL2 and
@@ -157,7 +156,6 @@ unsigned long sdei_arch_get_entry_point(int conduit)
 		return 0;
 	}
 
-#endif
 	if (IS_ENABLED(CONFIG_VMAP_STACK)) {
 		if (init_sdei_stacks())
 			return 0;