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

!821 resolved kernel-rt build problem in openEuler:22.03:LTS:SP1

Browse Source 
From: @zhangyh1992 
Reviewed-by: @guohaocs2c 
Signed-off-by: @guohaocs2c
This commit is contained in:
openeuler-ci-bot 2022-11-30 01:16:11 +00:00 committed by Gitee
commit 9c8312b359
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 989 additions and 977 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1922
0000-kernel-5.10.0-126.0.0-rt62.patch → 0000-kernel-5.10.0-129.0.0-rt62.patch
View File

File diff suppressed because it is too large Load Diff

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

@ -1,7 +1,7 @@
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
From 430ab8c58ebcf6305676db654c0711f9cf0e1d94 Mon Sep 17 00:00:00 2001
From: ryan <ryan@ex.com>
Date: Tue, 29 Nov 2022 15:23:28 +0800
Subject: [PATCH 2/2] modify-openeuler_defconfig-for-rt62
---
arch/arm64/configs/openeuler_defconfig | 5 +++--
@ -13,7 +13,7 @@ Subject: [PATCH 2/2] modify openeuler_defconfig for rt62
6 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig
index c6c3df7a0..42e028a44 100644
index a96c3ae85a19..ad870eabf021 100644
--- a/arch/arm64/configs/openeuler_defconfig
+++ b/arch/arm64/configs/openeuler_defconfig
@@ -73,6 +73,7 @@ CONFIG_HIGH_RES_TIMERS=y
@ -24,7 +24,7 @@ index c6c3df7a0..42e028a44 100644
#
# CPU/Task time and stats accounting
@@ -730,7 +731,7 @@ CONFIG_ACPI_MPAM=y
@@ -729,7 +730,7 @@ CONFIG_ACPI_MPAM=y
CONFIG_ACPI_PPTT=y
# CONFIG_PMIC_OPREGION is not set
CONFIG_IRQ_BYPASS_MANAGER=y
@ -33,7 +33,7 @@ index c6c3df7a0..42e028a44 100644
CONFIG_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
CONFIG_HAVE_KVM_IRQFD=y
@@ -1114,7 +1115,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
@@ -1116,7 +1117,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,7 +43,7 @@ index c6c3df7a0..42e028a44 100644
CONFIG_MEMORY_RELIABLE=y
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index 84520f116..aa631771e 100644
index 84520f11667d..aa631771e0dc 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -180,7 +180,7 @@ static void __get_cpu_fpsimd_context(void)
@ -65,7 +65,7 @@ index 84520f116..aa631771e 100644
static bool have_cpu_fpsimd_context(void)
diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig
index 228a657e4..3e7944663 100644
index e5a68009ed20..8a8b42b4cb59 100644
--- a/arch/x86/configs/openeuler_defconfig
+++ b/arch/x86/configs/openeuler_defconfig
@@ -88,9 +88,10 @@ CONFIG_NO_HZ=y
@ -89,7 +89,7 @@ index 228a657e4..3e7944663 100644
CONFIG_UID16=y
CONFIG_MULTIUSER=y
CONFIG_SGETMASK_SYSCALL=y
@@ -724,7 +725,7 @@ CONFIG_KVM_COMPAT=y
@@ -725,7 +726,7 @@ CONFIG_KVM_COMPAT=y
CONFIG_HAVE_KVM_IRQ_BYPASS=y
CONFIG_HAVE_KVM_NO_POLL=y
CONFIG_KVM_XFER_TO_GUEST_WORK=y
@ -97,9 +97,9 @@ index 228a657e4..3e7944663 100644
+# CONFIG_VIRTUALIZATION is not set
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
CONFIG_KVM_AMD=m
CONFIG_X86_SGX_KVM=y
diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
index a3b73de27..dda9ec24f 100644
index a3b73de276c3..dda9ec24fdc1 100644
--- a/arch/x86/include/asm/preempt.h
+++ b/arch/x86/include/asm/preempt.h
@@ -134,10 +134,8 @@ static __always_inline bool should_resched(int preempt_offset)
@ -132,7 +132,7 @@ index a3b73de27..dda9ec24f 100644
+
#endif /* __ASM_PREEMPT_H */
diff --git a/include/linux/printk.h b/include/linux/printk.h
index 9331b131b..23946f482 100644
index 9331b131ba25..23946f4828b2 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -241,7 +241,7 @@ __printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...);
@ -145,7 +145,7 @@ index 9331b131b..23946f482 100644
#else
static inline void zap_locks(void) { }
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 7859f42a6..d1a472283 100644
index e95b00f24c75..59bd804e662a 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1813,7 +1813,7 @@ static void print_sync_until(struct console *con, u64 seq)
@ -156,7 +156,7 @@ index 7859f42a6..d1a472283 100644
+#if (defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)) && !defined(CONFIG_PREEMPT_RT)
void zap_locks(void)
{
if (raw_spin_is_locked(&logbuf_lock)) {
// if (raw_spin_is_locked(&logbuf_lock)) {
--
2.36.1
2.25.1

10
kernel-rt.spec
View File

@ -10,9 +10,9 @@
%global upstream_version 5.10
%global upstream_sublevel 0
%global devel_release 126
%global devel_release 129
%global maintenance_release .0.0
%global pkg_release .54
%global pkg_release .55
%global rt_release .rt62
%define with_debuginfo 1
@ -71,7 +71,7 @@ Source9002: series.conf
Source9998: patches.tar.bz2
%endif
Patch0: 0000-kernel-5.10.0-126.0.0-rt62.patch
Patch0: 0000-kernel-5.10.0-129.0.0-rt62.patch
Patch1: 0001-modify-openeuler_defconfig-for-rt62.patch
#BuildRequires:
@ -886,6 +886,10 @@ fi
%endif
%changelog
* Mon Nov 28 2022 kylin-liyulei <liyulei@kylinos.cn> - 5.10.0-129.0.0.55
- add kernel-rt.spec and rt patches
* Mon Nov 21 2022 kylin-mayukun <mayukun@kylinos.cn> - 5.10.0-126.0.0.54
- add kernel-rt.spec and rt patches