packages/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!1570 kernel-rt：update kernel-rt version to 6.6.0-26.0.0.2

Browse Source 
From: @zhangyuge001 
Reviewed-by: @guohaocs2c, @zhengzengkai 
Signed-off-by: @guohaocs2c, @zhengzengkai
This commit is contained in:
openeuler-ci-bot 2024-05-15 03:37:48 +00:00 committed by Gitee
commit 9a89a52e25
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel-rt.spec
View File

@ -40,9 +40,9 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig
%global upstream_version 6.6
%global upstream_sublevel 0
%global devel_release 25
%global devel_release 26
%global maintenance_release .0.0
%global pkg_release .1
%global pkg_release .2
%global rt_release .rt20
%define with_debuginfo 1
@ -1057,6 +1057,8 @@ fi
%endif
%changelog
* Wed May 15 2024 zhangyu <zhangyu4@kylinos.cn> - 6.6.0-26.0.0.2
- update kernel-rt version to 6.6.0-26.0.0.2
* Mon May 10 2024 zhangyu <zhangyu4@kylinos.cn> - 6.6.0-25.0.0.1
- update kernel-rt version to 6.6.0-25.0.0.1

24
patch-6.6.0-6.0.0-rt20.patch-openeuler_defconfig.patch
View File

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