2024-05-15 10:28:08 +08:00
|
|
|
From 1d6979669dd8efc8ff55c6a8aa45b2c6c389aab2 Mon Sep 17 00:00:00 2001
|
2024-05-10 14:57:50 +08:00
|
|
|
From: zhangyu <zhangyu4@kylinos.cn>
|
2024-05-15 10:28:08 +08:00
|
|
|
Date: Wed, 15 May 2024 09:06:43 +0800
|
|
|
|
|
Subject: [PATCH] rt2
|
2024-05-10 14:57:50 +08:00
|
|
|
|
|
|
|
|
---
|
|
|
|
|
arch/arm64/configs/openeuler_defconfig | 4 ++--
|
|
|
|
|
arch/x86/configs/openeuler_defconfig | 8 ++++----
|
|
|
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig
|
2024-05-15 10:28:08 +08:00
|
|
|
index 4932a6be9..24873c5be 100644
|
2024-05-10 14:57:50 +08:00
|
|
|
--- a/arch/arm64/configs/openeuler_defconfig
|
|
|
|
|
+++ b/arch/arm64/configs/openeuler_defconfig
|
|
|
|
|
@@ -97,7 +97,7 @@ CONFIG_PREEMPT_NONE=y
|
2024-05-15 10:28:08 +08:00
|
|
|
# CONFIG_PREEMPT_VOLUNTARY is not set
|
2024-05-10 14:57:50 +08:00
|
|
|
# CONFIG_PREEMPT is not set
|
|
|
|
|
# CONFIG_PREEMPT_DYNAMIC is not set
|
|
|
|
|
-
|
|
|
|
|
+CONFIG_PREEMPT_RT=y
|
|
|
|
|
#
|
|
|
|
|
# CPU/Task time and stats accounting
|
|
|
|
|
#
|
2024-05-15 10:28:08 +08:00
|
|
|
@@ -754,7 +754,7 @@ CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
|
2024-05-10 14:57:50 +08:00
|
|
|
CONFIG_KVM_XFER_TO_GUEST_WORK=y
|
|
|
|
|
CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
|
2024-05-15 10:28:08 +08:00
|
|
|
CONFIG_KVM_HISI_VIRT=y
|
2024-05-10 14:57:50 +08:00
|
|
|
-CONFIG_VIRTUALIZATION=y
|
|
|
|
|
+#CONFIG_VIRTUALIZATION is not set
|
|
|
|
|
CONFIG_KVM=y
|
|
|
|
|
# CONFIG_NVHE_EL2_DEBUG is not set
|
2024-05-15 10:28:08 +08:00
|
|
|
CONFIG_KVM_ARM_MULTI_LPI_TRANSLATE_CACHE=y
|
2024-05-10 14:57:50 +08:00
|
|
|
diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig
|
2024-05-15 10:28:08 +08:00
|
|
|
index 9b5df8585..ece62e3df 100644
|
2024-05-10 14:57:50 +08:00
|
|
|
--- a/arch/x86/configs/openeuler_defconfig
|
|
|
|
|
+++ b/arch/x86/configs/openeuler_defconfig
|
2024-05-15 10:28:08 +08:00
|
|
|
@@ -112,11 +112,11 @@ CONFIG_BPF_SCHED=y
|
2024-05-10 14:57:50 +08:00
|
|
|
# end of BPF subsystem
|
|
|
|
|
|
|
|
|
|
CONFIG_PREEMPT_NONE_BUILD=y
|
|
|
|
|
-CONFIG_PREEMPT_NONE=y
|
|
|
|
|
+#CONFIG_PREEMPT_NONE is not set
|
|
|
|
|
# CONFIG_PREEMPT_VOLUNTARY is not set
|
|
|
|
|
# CONFIG_PREEMPT is not set
|
|
|
|
|
# CONFIG_PREEMPT_DYNAMIC is not set
|
|
|
|
|
-
|
|
|
|
|
+CONFIG_PREEMPT_RT=y
|
|
|
|
|
#
|
|
|
|
|
# CPU/Task time and stats accounting
|
|
|
|
|
#
|
2024-05-15 10:28:08 +08:00
|
|
|
@@ -248,7 +248,7 @@ CONFIG_SYSCTL=y
|
2024-05-10 14:57:50 +08:00
|
|
|
CONFIG_HAVE_UID16=y
|
|
|
|
|
CONFIG_SYSCTL_EXCEPTION_TRACE=y
|
|
|
|
|
CONFIG_HAVE_PCSPKR_PLATFORM=y
|
|
|
|
|
-# CONFIG_EXPERT is not set
|
|
|
|
|
+CONFIG_EXPERT=y
|
|
|
|
|
CONFIG_UID16=y
|
|
|
|
|
CONFIG_MULTIUSER=y
|
|
|
|
|
CONFIG_SGETMASK_SYSCALL=y
|
2024-05-15 10:28:08 +08:00
|
|
|
@@ -744,7 +744,7 @@ CONFIG_HAVE_KVM_NO_POLL=y
|
2024-05-10 14:57:50 +08:00
|
|
|
CONFIG_KVM_XFER_TO_GUEST_WORK=y
|
|
|
|
|
CONFIG_HAVE_KVM_PM_NOTIFIER=y
|
|
|
|
|
CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
|
|
|
|
|
-CONFIG_VIRTUALIZATION=y
|
|
|
|
|
+# CONFIG_VIRTUALIZATION is not set
|
|
|
|
|
CONFIG_KVM=m
|
|
|
|
|
CONFIG_KVM_INTEL=m
|
|
|
|
|
CONFIG_X86_SGX_KVM=y
|
|
|
|
|
--
|
|
|
|
|
2.41.0
|
|
|
|
|
|