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

Compare commits

base: packages:38bd0b4fa5b819c32a578672d72134f457743005
Branches Tags
packages:main
..
compare: packages:8a3dbf1eb31bf8c58a0e90e5c198c5c4da6fe989
Branches Tags
packages:main

No commits in common. "38bd0b4fa5b819c32a578672d72134f457743005" and "8a3dbf1eb31bf8c58a0e90e5c198c5c4da6fe989" have entirely different histories.
38bd0b4fa5 ... 8a3dbf1eb3

8 changed files with 1256 additions and 5763 deletions
Show Stats Expand all files Collapse all files

433
0000-raspberrypi-kernel.patch
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -1,18 +1,19 @@
From bd09e454866f567be3b89e2e4f3d46cca6da9521 Mon Sep 17 00:00:00 2001 From b17c5ed418d6cdd498aaa2b4bb29df1d640ba8ad Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu4@kylinos.cn> From: zhangyu <zhangyu4@kylinos.cn>
Date: Mon, 20 Jan 2025 14:19:57 +0800 Date: Tue, 18 Jun 2024 12:59:41 +0800
Subject: [PATCH 2/2] rt2 Subject: [PATCH 2/2] zhy2
--- ---
arch/arm64/configs/openeuler_defconfig | 7 ++++--- arch/arm64/configs/openeuler_defconfig | 5 +++--
arch/arm64/kernel/fpsimd.c | 4 ++-- arch/arm64/kernel/fpsimd.c | 4 ++--
arch/x86/configs/openeuler_defconfig | 8 ++++---- arch/x86/configs/openeuler_defconfig | 8 ++++----
arch/x86/include/asm/preempt.h | 16 +++++++++++++--- arch/x86/include/asm/preempt.h | 16 +++++++++++++---
include/linux/printk.h | 2 +- include/linux/printk.h | 2 +-
5 files changed, 24 insertions(+), 13 deletions(-) kernel/printk/printk.c | 2 +-
6 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig
index 1830460ef..b68aed59d 100644 index 05b50ca38..5baa109a4 100644
--- a/arch/arm64/configs/openeuler_defconfig --- a/arch/arm64/configs/openeuler_defconfig
+++ b/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig
@@ -87,6 +87,7 @@ CONFIG_HIGH_RES_TIMERS=y @@ -87,6 +87,7 @@ CONFIG_HIGH_RES_TIMERS=y
@ -23,7 +24,7 @@ index 1830460ef..b68aed59d 100644
# #
# CPU/Task time and stats accounting # CPU/Task time and stats accounting
@@ -775,7 +776,7 @@ CONFIG_ACPI_PPTT=y @@ -772,7 +773,7 @@ CONFIG_ACPI_PPTT=y
CONFIG_ACPI_PCC=y CONFIG_ACPI_PCC=y
# CONFIG_PMIC_OPREGION is not set # CONFIG_PMIC_OPREGION is not set
CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_IRQ_BYPASS_MANAGER=y
@ -32,7 +33,7 @@ index 1830460ef..b68aed59d 100644
CONFIG_KVM=y CONFIG_KVM=y
CONFIG_CVM_HOST=y CONFIG_CVM_HOST=y
CONFIG_CVM_GUEST=y CONFIG_CVM_GUEST=y
@@ -1178,7 +1179,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y @@ -1174,7 +1175,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
# CONFIG_GUP_BENCHMARK is not set # CONFIG_GUP_BENCHMARK is not set
# CONFIG_READ_ONLY_THP_FOR_FS is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set
CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_ARCH_HAS_PTE_SPECIAL=y
@ -41,17 +42,8 @@ index 1830460ef..b68aed59d 100644
CONFIG_PID_RESERVE=y CONFIG_PID_RESERVE=y
CONFIG_MEMORY_RELIABLE=y CONFIG_MEMORY_RELIABLE=y
# CONFIG_CLEAR_FREELIST_PAGE is not set # CONFIG_CLEAR_FREELIST_PAGE is not set
@@ -6122,7 +6123,7 @@ CONFIG_HISI_HBMDEV=y
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 diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index 131b2dda3..992c11f2c 100644 index 53753ae47..bcdd1bf20 100644
--- a/arch/arm64/kernel/fpsimd.c --- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c
@@ -234,7 +234,7 @@ static void __get_cpu_fpsimd_context(void) @@ -234,7 +234,7 @@ static void __get_cpu_fpsimd_context(void)
@ -73,7 +65,7 @@ index 131b2dda3..992c11f2c 100644
static bool have_cpu_fpsimd_context(void) static bool have_cpu_fpsimd_context(void)
diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig
index f7ff24ef3..921df8c8e 100644 index f3b810d0c..4494a5785 100644
--- a/arch/x86/configs/openeuler_defconfig --- a/arch/x86/configs/openeuler_defconfig
+++ b/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig
@@ -89,10 +89,10 @@ CONFIG_HIGH_RES_TIMERS=y @@ -89,10 +89,10 @@ CONFIG_HIGH_RES_TIMERS=y
@ -89,7 +81,7 @@ index f7ff24ef3..921df8c8e 100644
# #
# CPU/Task time and stats accounting # CPU/Task time and stats accounting
# #
@@ -218,7 +218,7 @@ CONFIG_HAVE_UID16=y @@ -217,7 +217,7 @@ CONFIG_HAVE_UID16=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_HAVE_PCSPKR_PLATFORM=y
CONFIG_BPF=y CONFIG_BPF=y
@ -98,7 +90,7 @@ index f7ff24ef3..921df8c8e 100644
CONFIG_UID16=y CONFIG_UID16=y
CONFIG_MULTIUSER=y CONFIG_MULTIUSER=y
CONFIG_SGETMASK_SYSCALL=y CONFIG_SGETMASK_SYSCALL=y
@@ -760,7 +760,7 @@ CONFIG_KVM_COMPAT=y @@ -758,7 +758,7 @@ CONFIG_KVM_COMPAT=y
CONFIG_HAVE_KVM_IRQ_BYPASS=y CONFIG_HAVE_KVM_IRQ_BYPASS=y
CONFIG_HAVE_KVM_NO_POLL=y CONFIG_HAVE_KVM_NO_POLL=y
CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_KVM_XFER_TO_GUEST_WORK=y
@ -153,6 +145,19 @@ index 26c70fd11..c82c971e8 100644
extern void zap_locks(void); extern void zap_locks(void);
#else #else
static inline void zap_locks(void) { } static inline void zap_locks(void) { }
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index f068738c7..82d58ad08 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);
}
-#if defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)
+#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)) {
-- --
2.41.0 2.41.0

2
SOURCE
View File

@ -1 +1 @@
5.10.0-261.0.0 5.10.0-216.0.0

14
kernel-rt.spec
View File

@ -9,9 +9,9 @@
%global upstream_version 5.10 %global upstream_version 5.10
%global upstream_sublevel 0 %global upstream_sublevel 0
%global devel_release 249 %global devel_release 209
%global maintenance_release .0.0 %global maintenance_release .0.0
%global pkg_release .65 %global pkg_release .62
%global rt_release .rt62 %global rt_release .rt62
%define with_debuginfo 1 %define with_debuginfo 1
@ -958,16 +958,6 @@ fi
%endif %endif
%changelog %changelog
* Wed Feb 19 2025 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-249.0.0.65
- update kernel-rt version to 5.10.0-249.0.0
* Mon Jan 20 2025 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-246.0.0.64
- update kernel-rt version to 5.10.0-246.0.0
* 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 * 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 - update kernel-rt version to 5.10.0-209.0.0

4618
kernel.spec
View File

File diff suppressed because it is too large Load Diff

7
raspberrypi-kernel-rt.spec
View File

@ -2,13 +2,13 @@
%global KernelVer %{version}-%{release}.raspi.%{_target_cpu} %global KernelVer %{version}-%{release}.raspi.%{_target_cpu}
%global hulkrelease 236.0.0 %global hulkrelease 209.0.0
%global debug_package %{nil} %global debug_package %{nil}
Name: raspberrypi-kernel-rt Name: raspberrypi-kernel-rt
Version: 5.10.0 Version: 5.10.0
Release: %{hulkrelease}.rt62.13 Release: %{hulkrelease}.rt62.12
Summary: Linux Kernel Summary: Linux Kernel
License: GPLv2 License: GPLv2
URL: http://www.kernel.org/ URL: http://www.kernel.org/
@ -268,9 +268,6 @@ fi
/usr/src/kernels/%{KernelVer} /usr/src/kernels/%{KernelVer}
%changelog %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 * 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 - - update preempt-RT to openEuler 5.10.0-209.0.0

10
raspberrypi-kernel.spec
View File

@ -2,13 +2,13 @@
%global KernelVer %{version}-%{release}.raspi.%{_target_cpu} %global KernelVer %{version}-%{release}.raspi.%{_target_cpu}
%global hulkrelease 235.0.0 %global hulkrelease 209.0.0
%global debug_package %{nil} %global debug_package %{nil}
Name: raspberrypi-kernel Name: raspberrypi-kernel
Version: 5.10.0 Version: 5.10.0
Release: %{hulkrelease}.23 Release: %{hulkrelease}.21
Summary: Linux Kernel Summary: Linux Kernel
License: GPLv2 License: GPLv2
URL: http://www.kernel.org/ URL: http://www.kernel.org/
@ -262,12 +262,6 @@ fi
/usr/src/kernels/%{KernelVer} /usr/src/kernels/%{KernelVer}
%changelog %changelog
* Wed Nov 6 2024 Yafen Fang <yafen@iscas.ac.cn> - 5.10.0-235.0.0.23
- update kernel version to openEuler 5.10.0-235.0.0
* Sun Jul 21 2024 Yafen Fang <yafen@iscas.ac.cn> - 5.10.0-219.0.0.22
- update kernel version to openEuler 5.10.0-219.0.0
* Thu Jun 20 2024 Yafen Fang <yafen@iscas.ac.cn> - 5.10.0-209.0.0.21 * Thu Jun 20 2024 Yafen Fang <yafen@iscas.ac.cn> - 5.10.0-209.0.0.21
- update kernel version to openEuler 5.10.0-209.0.0 - update kernel version to openEuler 5.10.0-209.0.0