!1965 kernek-rt update to 5.10.0-250.0.0.65
From: @zhangyuge001 Reviewed-by: @guohaocs2c Signed-off-by: @linan888
This commit is contained in:
commit
6f85771431
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
|||||||
From 3847d04e7d950d5aa85193b4154acd1682984e83 Mon Sep 17 00:00:00 2001
|
From aae292d972e3c1b16ce8fbcd934bc9997df4bd79 Mon Sep 17 00:00:00 2001
|
||||||
From: zhangyu <zhangyu4@kylinos.cn>
|
From: zhangyu <zhangyu4@kylinos.cn>
|
||||||
Date: Tue, 19 Nov 2024 20:45:34 +0800
|
Date: Thu, 20 Feb 2025 09:18:23 +0800
|
||||||
Subject: [PATCH] hhhhhhh
|
Subject: [PATCH 2/2] rt2
|
||||||
|
|
||||||
---
|
---
|
||||||
arch/arm64/configs/openeuler_defconfig | 8 ++++----
|
arch/arm64/configs/openeuler_defconfig | 8 ++++----
|
||||||
@ -9,11 +9,10 @@ Subject: [PATCH] hhhhhhh
|
|||||||
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 +-
|
||||||
kernel/printk/printk.c | 2 +-
|
5 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
|
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig
|
||||||
index 4c117f2f5..541af5c5c 100644
|
index c3b7dd2c3..bafb54456 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,7 +87,7 @@ CONFIG_HIGH_RES_TIMERS=y
|
@@ -87,7 +87,7 @@ CONFIG_HIGH_RES_TIMERS=y
|
||||||
@ -25,7 +24,7 @@ index 4c117f2f5..541af5c5c 100644
|
|||||||
#
|
#
|
||||||
# CPU/Task time and stats accounting
|
# CPU/Task time and stats accounting
|
||||||
#
|
#
|
||||||
@@ -774,7 +774,7 @@ CONFIG_ACPI_PPTT=y
|
@@ -775,7 +775,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
|
||||||
@ -34,7 +33,7 @@ index 4c117f2f5..541af5c5c 100644
|
|||||||
CONFIG_KVM=y
|
CONFIG_KVM=y
|
||||||
CONFIG_CVM_HOST=y
|
CONFIG_CVM_HOST=y
|
||||||
CONFIG_CVM_GUEST=y
|
CONFIG_CVM_GUEST=y
|
||||||
@@ -1177,7 +1177,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
|
@@ -1178,7 +1178,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
|
||||||
@ -43,7 +42,7 @@ index 4c117f2f5..541af5c5c 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
|
||||||
@@ -6121,7 +6121,7 @@ CONFIG_HISI_HBMDEV=m
|
@@ -6123,7 +6123,7 @@ CONFIG_HISI_HBMDEV=y
|
||||||
CONFIG_HISI_HBMCACHE=m
|
CONFIG_HISI_HBMCACHE=m
|
||||||
CONFIG_HISI_HBMDEV_ACLS=y
|
CONFIG_HISI_HBMDEV_ACLS=y
|
||||||
CONFIG_HISI_L3T=m
|
CONFIG_HISI_L3T=m
|
||||||
@ -75,7 +74,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 bfaadb4b2..7f5b8e327 100644
|
index f5b51f261..8561f183b 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
|
||||||
@ -155,19 +154,6 @@ 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 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)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
-#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
|
||||||
|
|
||||||
|
|||||||
@ -10,9 +10,9 @@
|
|||||||
|
|
||||||
%global upstream_version 5.10
|
%global upstream_version 5.10
|
||||||
%global upstream_sublevel 0
|
%global upstream_sublevel 0
|
||||||
%global devel_release 236
|
%global devel_release 250
|
||||||
%global maintenance_release .0.0
|
%global maintenance_release .0.0
|
||||||
%global pkg_release .64
|
%global pkg_release .65
|
||||||
%global rt_release .rt62
|
%global rt_release .rt62
|
||||||
|
|
||||||
%define with_debuginfo 1
|
%define with_debuginfo 1
|
||||||
@ -891,6 +891,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 20 2025 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-250.0.0.65
|
||||||
|
- update kernel-rt version to 5.10.0-250.0.0
|
||||||
|
|
||||||
* Mon Nov 18 2024 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-236.0.0.64
|
* 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
|
- update kernel-rt version to 5.10.0-236.0.0
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user