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

!1828 kernel-rt:update to 5.10.0-236.0.0.63 && rpi-rt:update to 5.10.0-236.0.0.13

Browse Source 
From: @zhangyuge001 
Reviewed-by: @guohaocs2c 
Signed-off-by: @guohaocs2c
This commit is contained in:
openeuler-ci-bot 2024-11-20 03:13:35 +00:00 committed by Gitee
commit 6349e481c8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 912 additions and 894 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1751
0001-apply-preempt-RT-patch.patch
View File

File diff suppressed because it is too large Load Diff

41
0001-modify-openeuler_defconfig-for-rt62.patch
View File

@ -1,19 +1,19 @@
From b17c5ed418d6cdd498aaa2b4bb29df1d640ba8ad Mon Sep 17 00:00:00 2001
From 1a753f6f04e78dcf92670a255eb99360b3dc0337 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu4@kylinos.cn>
Date: Tue, 18 Jun 2024 12:59:41 +0800
Subject: [PATCH 2/2] zhy2
Date: Tue, 19 Nov 2024 19:02:54 +0800
Subject: [PATCH] rt-config
---
arch/arm64/configs/openeuler_defconfig | 5 +++--
arch/arm64/configs/openeuler_defconfig | 7 ++++---
arch/arm64/kernel/fpsimd.c | 4 ++--
arch/x86/configs/openeuler_defconfig | 8 ++++----
arch/x86/include/asm/preempt.h | 16 +++++++++++++---
include/linux/printk.h | 2 +-
kernel/printk/printk.c | 2 +-
6 files changed, 24 insertions(+), 13 deletions(-)
6 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig
index 05b50ca38..5baa109a4 100644
index 4c117f2f5..2d90b4f5e 100644
--- a/arch/arm64/configs/openeuler_defconfig
+++ b/arch/arm64/configs/openeuler_defconfig
@@ -87,6 +87,7 @@ CONFIG_HIGH_RES_TIMERS=y
@ -24,7 +24,7 @@ index 05b50ca38..5baa109a4 100644
#
# CPU/Task time and stats accounting
@@ -772,7 +773,7 @@ CONFIG_ACPI_PPTT=y
@@ -774,7 +775,7 @@ CONFIG_ACPI_PPTT=y
CONFIG_ACPI_PCC=y
# CONFIG_PMIC_OPREGION is not set
CONFIG_IRQ_BYPASS_MANAGER=y
@ -33,7 +33,7 @@ index 05b50ca38..5baa109a4 100644
CONFIG_KVM=y
CONFIG_CVM_HOST=y
CONFIG_CVM_GUEST=y
@@ -1174,7 +1175,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
@@ -1177,7 +1178,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
# CONFIG_GUP_BENCHMARK is not set
# CONFIG_READ_ONLY_THP_FOR_FS is not set
CONFIG_ARCH_HAS_PTE_SPECIAL=y
@ -42,8 +42,17 @@ index 05b50ca38..5baa109a4 100644
CONFIG_PID_RESERVE=y
CONFIG_MEMORY_RELIABLE=y
# CONFIG_CLEAR_FREELIST_PAGE is not set
@@ -6121,7 +6122,7 @@ CONFIG_HISI_HBMDEV=m
CONFIG_HISI_HBMCACHE=m
CONFIG_HISI_HBMDEV_ACLS=y
CONFIG_HISI_L3T=m
-CONFIG_HISI_L0=m
+#CONFIG_HISI_L0 is not set
CONFIG_HISI_MEM_RAS=m
# end of Hisilicon SoC drivers
# end of SOC (System On Chip) specific Drivers
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index 53753ae47..bcdd1bf20 100644
index 131b2dda3..992c11f2c 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -234,7 +234,7 @@ static void __get_cpu_fpsimd_context(void)
@ -65,7 +74,7 @@ index 53753ae47..bcdd1bf20 100644
static bool have_cpu_fpsimd_context(void)
diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig
index f3b810d0c..4494a5785 100644
index bfaadb4b2..7f5b8e327 100644
--- a/arch/x86/configs/openeuler_defconfig
+++ b/arch/x86/configs/openeuler_defconfig
@@ -89,10 +89,10 @@ CONFIG_HIGH_RES_TIMERS=y
@ -81,7 +90,7 @@ index f3b810d0c..4494a5785 100644
#
# CPU/Task time and stats accounting
#
@@ -217,7 +217,7 @@ CONFIG_HAVE_UID16=y
@@ -218,7 +218,7 @@ CONFIG_HAVE_UID16=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_HAVE_PCSPKR_PLATFORM=y
CONFIG_BPF=y
@ -90,7 +99,7 @@ index f3b810d0c..4494a5785 100644
CONFIG_UID16=y
CONFIG_MULTIUSER=y
CONFIG_SGETMASK_SYSCALL=y
@@ -758,7 +758,7 @@ CONFIG_KVM_COMPAT=y
@@ -760,7 +760,7 @@ CONFIG_KVM_COMPAT=y
CONFIG_HAVE_KVM_IRQ_BYPASS=y
CONFIG_HAVE_KVM_NO_POLL=y
CONFIG_KVM_XFER_TO_GUEST_WORK=y
@ -146,15 +155,15 @@ index 26c70fd11..c82c971e8 100644
#else
static inline void zap_locks(void) { }
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index f068738c7..82d58ad08 100644
index 88a877fdc..331762a96 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1821,7 +1821,7 @@ static void print_sync_until(struct console *con, u64 seq)
console_atomic_unlock(flags);
@@ -1826,7 +1826,7 @@ static void print_sync_until(struct console *con, u64 seq)
}
-#if defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)
+#if 0//(defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)) && !defined(CONFIG_PREEMPT_RT)
+#if 0 //defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)
void zap_locks(void)
{
// if (raw_spin_is_locked(&logbuf_lock)) {

7
kernel-rt.spec
View File

@ -9,9 +9,9 @@
%global upstream_version 5.10
%global upstream_sublevel 0
%global devel_release 209
%global devel_release 236
%global maintenance_release .0.0
%global pkg_release .62
%global pkg_release .63
%global rt_release .rt62
%define with_debuginfo 1
@ -958,6 +958,9 @@ fi
%endif
%changelog
* Mon Nov 18 2024 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-236.0.0.63
- update kernel-rt version to 5.10.0-236.0.0
* Thu Jun 20 2024 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-209.0.0.62
- update kernel-rt version to 5.10.0-209.0.0

7
raspberrypi-kernel-rt.spec
View File

@ -2,13 +2,13 @@
%global KernelVer %{version}-%{release}.raspi.%{_target_cpu}
%global hulkrelease 209.0.0
%global hulkrelease 236.0.0
%global debug_package %{nil}
Name: raspberrypi-kernel-rt
Version: 5.10.0
Release: %{hulkrelease}.rt62.12
Release: %{hulkrelease}.rt62.13
Summary: Linux Kernel
License: GPLv2
URL: http://www.kernel.org/
@ -268,6 +268,9 @@ fi
/usr/src/kernels/%{KernelVer}
%changelog
* Mon Nov 18 2024 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-236.0.0.13
- - update preempt-RT to openEuler 5.10.0-236.0.0
* Fri Jun 21 2024 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-209.0.0.12
- - update preempt-RT to openEuler 5.10.0-209.0.0