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

kernel-rt:update to 5.10.0-236.0.0.64 && rpi-rt:update to 5.10.0-236.0.0.12

Browse Source
This commit is contained in:
zhangyu 2024-11-20 09:58:27 +08:00
parent c56ec83cb9
commit 224e3e98c6
4 changed files with 557 additions and 537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -1,19 +1,19 @@
From d59dd9d1db2cbc2171e5dd22b522d2c1e8f5e4ae Mon Sep 17 00:00:00 2001
From 3847d04e7d950d5aa85193b4154acd1682984e83 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu4@kylinos.cn>
Date: Thu, 16 May 2024 16:33:51 +0800
Subject: [PATCH 2/2] zzzy2
Date: Tue, 19 Nov 2024 20:45:34 +0800
Subject: [PATCH] hhhhhhh
---
arch/arm64/configs/openeuler_defconfig | 6 +++---
arch/arm64/configs/openeuler_defconfig | 8 ++++----
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(+), 14 deletions(-)
6 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig
index 34061d75a..58ece1076 100644
index 4c117f2f5..541af5c5c 100644
--- a/arch/arm64/configs/openeuler_defconfig
+++ b/arch/arm64/configs/openeuler_defconfig
@@ -87,7 +87,7 @@ CONFIG_HIGH_RES_TIMERS=y
@ -25,8 +25,8 @@ index 34061d75a..58ece1076 100644
#
# CPU/Task time and stats accounting
#
@@ -760,7 +760,7 @@ CONFIG_ACPI_MPAM=y
CONFIG_ACPI_PPTT=y
@@ -774,7 +774,7 @@ CONFIG_ACPI_PPTT=y
CONFIG_ACPI_PCC=y
# CONFIG_PMIC_OPREGION is not set
CONFIG_IRQ_BYPASS_MANAGER=y
-CONFIG_VIRTUALIZATION=y
@ -34,7 +34,7 @@ index 34061d75a..58ece1076 100644
CONFIG_KVM=y
CONFIG_CVM_HOST=y
CONFIG_CVM_GUEST=y
@@ -1159,7 +1159,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
@@ -1177,7 +1177,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
@ -43,6 +43,15 @@ index 34061d75a..58ece1076 100644
CONFIG_PID_RESERVE=y
CONFIG_MEMORY_RELIABLE=y
# CONFIG_CLEAR_FREELIST_PAGE is not set
@@ -6121,7 +6121,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 131b2dda3..992c11f2c 100644
--- a/arch/arm64/kernel/fpsimd.c
@ -66,7 +75,7 @@ index 131b2dda3..992c11f2c 100644
static bool have_cpu_fpsimd_context(void)
diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig
index 91c85e1c2..ca197fcaf 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
@ -82,7 +91,7 @@ index 91c85e1c2..ca197fcaf 100644
#
# CPU/Task time and stats accounting
#
@@ -212,7 +212,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
@ -91,7 +100,7 @@ index 91c85e1c2..ca197fcaf 100644
CONFIG_UID16=y
CONFIG_MULTIUSER=y
CONFIG_SGETMASK_SYSCALL=y
@@ -749,7 +749,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
@ -147,15 +156,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 80c97bc3e..86380c37f 100644
index 88a877fdc..515fea620 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1826,7 +1826,7 @@ static void print_sync_until(struct console *con, u64 seq)
console_atomic_unlock(flags);
}
-#if defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)
+#if (defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)) && !defined(CONFIG_PREEMPT_RT)
+#if 0 //(defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)) && !defined(CONFIG_PREEMPT_RT)
void zap_locks(void)
{
// if (raw_spin_is_locked(&logbuf_lock)) {

7
kernel-rt.spec
View File

@ -10,9 +10,9 @@
%global upstream_version 5.10
%global upstream_sublevel 0
%global devel_release 199
%global devel_release 236
%global maintenance_release .0.0
%global pkg_release .63
%global pkg_release .64
%global rt_release .rt62
%define with_debuginfo 1
@ -891,6 +891,9 @@ fi
%endif
%changelog
* Mon Nov 18 2024 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-236.0.0.64
- update kernel-rt version to 5.10.0-236.0.0
* Thu May 16 2024 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-199.0.0.63
- update kernel-rt version to 5.10.0-199.0.0

7
raspberrypi-kernel-rt.spec
View File

@ -2,13 +2,13 @@
%global KernelVer %{version}-%{release}.raspi.%{_target_cpu}
%global hulkrelease 177.0.0
%global hulkrelease 236.0.0
%global debug_package %{nil}
Name: raspberrypi-kernel-rt
Version: 5.10.0
Release: %{hulkrelease}.rt62.11
Release: %{hulkrelease}.rt62.12
Summary: Linux Kernel
License: GPLv2
URL: http://www.kernel.org/
@ -172,6 +172,9 @@ install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/
/lib/modules/%{KernelVer}
%changelog
* Mon Nov 18 2024 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-236.0.0.12
- - update preempt-RT to openEuler 5.10.0-236.0.0
* Fri Dec 12 2023 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-177.0.0.11
- - update preempt-RT to openEuler 5.10.0-177.0.0