!810 Kernel-rt: 基于openeuler kernel version 5.10.0-126.0.0添加 kernel-rt

From: @kylin-mayukun 
Reviewed-by: @guohaocs2c 
Signed-off-by: @guohaocs2c
This commit is contained in:
openeuler-ci-bot 2022-11-22 01:51:34 +00:00 committed by Gitee
commit c3abb1bf44
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 474 additions and 454 deletions

View File

@ -1,5 +1,19 @@
From b5ea0359812e3b58757d8275a8a58b94cbef599f Mon Sep 17 00:00:00 2001
From: kylin-mayukun <mayukun@kylinos.cn>
Date: Mon, 21 Nov 2022 21:52:08 +0800
Subject: [PATCH 2/2] modify openeuler_defconfig for rt62
---
arch/arm64/configs/openeuler_defconfig | 5 +++--
arch/arm64/kernel/fpsimd.c | 4 ++--
arch/x86/configs/openeuler_defconfig | 7 ++++---
arch/x86/include/asm/preempt.h | 16 +++++++++++++---
include/linux/printk.h | 2 +-
kernel/printk/printk.c | 2 +-
6 files changed, 24 insertions(+), 12 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 78a63cbc3..124f3e929 100644 index c6c3df7a0..42e028a44 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
@@ -73,6 +73,7 @@ CONFIG_HIGH_RES_TIMERS=y @@ -73,6 +73,7 @@ CONFIG_HIGH_RES_TIMERS=y
@ -10,7 +24,7 @@ index 78a63cbc3..124f3e929 100644
# #
# CPU/Task time and stats accounting # CPU/Task time and stats accounting
@@ -725,7 +726,7 @@ CONFIG_ACPI_MPAM=y @@ -730,7 +731,7 @@ CONFIG_ACPI_MPAM=y
CONFIG_ACPI_PPTT=y CONFIG_ACPI_PPTT=y
# CONFIG_PMIC_OPREGION is not set # CONFIG_PMIC_OPREGION is not set
CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_IRQ_BYPASS_MANAGER=y
@ -19,7 +33,7 @@ index 78a63cbc3..124f3e929 100644
CONFIG_KVM=y CONFIG_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_IRQCHIP=y
CONFIG_HAVE_KVM_IRQFD=y CONFIG_HAVE_KVM_IRQFD=y
@@ -1107,7 +1108,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y @@ -1114,7 +1115,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
@ -51,7 +65,7 @@ index 84520f116..aa631771e 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 f9c94b618..fdba98e7a 100644 index 228a657e4..3e7944663 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
@@ -88,9 +88,10 @@ CONFIG_NO_HZ=y @@ -88,9 +88,10 @@ CONFIG_NO_HZ=y
@ -131,10 +145,10 @@ index 9331b131b..23946f482 100644
#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 diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index eeeb590e1..d6fc0ae57 100644 index 7859f42a6..d1a472283 100644
--- a/kernel/printk/printk.c --- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c +++ b/kernel/printk/printk.c
@@ -1811,7 +1811,7 @@ static void print_sync_until(struct console *con, u64 seq) @@ -1813,7 +1813,7 @@ static void print_sync_until(struct console *con, u64 seq)
console_atomic_unlock(flags); console_atomic_unlock(flags);
} }
@ -143,3 +157,6 @@ index eeeb590e1..d6fc0ae57 100644
void zap_locks(void) void zap_locks(void)
{ {
if (raw_spin_is_locked(&logbuf_lock)) { if (raw_spin_is_locked(&logbuf_lock)) {
--
2.36.1

View File

@ -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 121 %global devel_release 126
%global maintenance_release .0.0 %global maintenance_release .0.0
%global pkg_release .53 %global pkg_release .54
%global rt_release .rt62 %global rt_release .rt62
%define with_debuginfo 1 %define with_debuginfo 1
@ -71,7 +71,7 @@ Source9002: series.conf
Source9998: patches.tar.bz2 Source9998: patches.tar.bz2
%endif %endif
Patch0: 0000-kernel-5.10.0-121.0.0-rt62.patch Patch0: 0000-kernel-5.10.0-126.0.0-rt62.patch
Patch1: 0001-modify-openeuler_defconfig-for-rt62.patch Patch1: 0001-modify-openeuler_defconfig-for-rt62.patch
#BuildRequires: #BuildRequires:
@ -886,6 +886,9 @@ fi
%endif %endif
%changelog %changelog
* Mon Nov 21 2022 kylin-mayukun <mayukun@kylinos.cn> - 5.10.0-126.0.0.54
- add kernel-rt.spec and rt patches
* Wed Nov 02 2022 kylin-mayukun <mayukun@kylinos.cn> - 5.10.0-121.0.0.53 * Wed Nov 02 2022 kylin-mayukun <mayukun@kylinos.cn> - 5.10.0-121.0.0.53
- add kernel-rt.spec and rt patches - add kernel-rt.spec and rt patches