kernel-rt: update to 5.10.0-246.0.0.64

0001-modify-openeuler_defconfig-for-rt62.patch

@@ -1,7 +1,7 @@
-From 1a753f6f04e78dcf92670a255eb99360b3dc0337 Mon Sep 17 00:00:00 2001
+From bd09e454866f567be3b89e2e4f3d46cca6da9521 Mon Sep 17 00:00:00 2001
 From: zhangyu <zhangyu4@kylinos.cn>
-Date: Tue, 19 Nov 2024 19:02:54 +0800
+Date: Mon, 20 Jan 2025 14:19:57 +0800
-Subject: [PATCH] rt-config
+Subject: [PATCH 2/2] rt2
 
 ---
  arch/arm64/configs/openeuler_defconfig |  7 ++++---
@@ -9,11 +9,10 @@ Subject: [PATCH] rt-config
  arch/x86/configs/openeuler_defconfig   |  8 ++++----
  arch/x86/include/asm/preempt.h         | 16 +++++++++++++---
  include/linux/printk.h                 |  2 +-
- kernel/printk/printk.c                 |  2 +-
+ 5 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 4c117f2f5..2d90b4f5e 100644
+index 1830460ef..b68aed59d 100644
 --- a/arch/arm64/configs/openeuler_defconfig
 +++ b/arch/arm64/configs/openeuler_defconfig
 @@ -87,6 +87,7 @@ CONFIG_HIGH_RES_TIMERS=y
@@ -24,7 +23,7 @@ index 4c117f2f5..2d90b4f5e 100644
  
  #
  # CPU/Task time and stats accounting
-@@ -774,7 +775,7 @@ CONFIG_ACPI_PPTT=y
+@@ -775,7 +776,7 @@ CONFIG_ACPI_PPTT=y
  CONFIG_ACPI_PCC=y
  # CONFIG_PMIC_OPREGION is not set
  CONFIG_IRQ_BYPASS_MANAGER=y
@@ -33,7 +32,7 @@ index 4c117f2f5..2d90b4f5e 100644
  CONFIG_KVM=y
  CONFIG_CVM_HOST=y
  CONFIG_CVM_GUEST=y
-@@ -1177,7 +1178,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+@@ -1178,7 +1179,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,7 +41,7 @@ index 4c117f2f5..2d90b4f5e 100644
  CONFIG_PID_RESERVE=y
  CONFIG_MEMORY_RELIABLE=y
  # CONFIG_CLEAR_FREELIST_PAGE is not set
-@@ -6121,7 +6122,7 @@ CONFIG_HISI_HBMDEV=m
+@@ -6122,7 +6123,7 @@ CONFIG_HISI_HBMDEV=y
  CONFIG_HISI_HBMCACHE=m
  CONFIG_HISI_HBMDEV_ACLS=y
  CONFIG_HISI_L3T=m
@@ -74,7 +73,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 bfaadb4b2..7f5b8e327 100644
+index f7ff24ef3..921df8c8e 100644
 --- a/arch/x86/configs/openeuler_defconfig
 +++ b/arch/x86/configs/openeuler_defconfig
 @@ -89,10 +89,10 @@ CONFIG_HIGH_RES_TIMERS=y
@@ -154,19 +153,6 @@ index 26c70fd11..c82c971e8 100644
  extern void zap_locks(void);
  #else
  static inline void zap_locks(void) { }
-diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index 88a877fdc..331762a96 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)
- void zap_locks(void)
- {
- //	if (raw_spin_is_locked(&logbuf_lock)) {
 -- 
 2.41.0
 

kernel-rt.spec

@@ -9,9 +9,9 @@
 
 %global upstream_version    5.10
 %global upstream_sublevel   0
-%global devel_release       236
+%global devel_release       246
 %global maintenance_release .0.0
-%global pkg_release         .63
+%global pkg_release         .64
 %global rt_release          .rt62
 
 %define with_debuginfo 1
@@ -958,6 +958,10 @@ fi
 %endif
 
 %changelog
+*  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