From 9d5f4f5da4c4663ab20010b5a2fbfd13adff1af1 Mon Sep 17 00:00:00 2001 From: liangqifeng Date: Fri, 31 Mar 2023 09:53:03 +0800 Subject: [PATCH] fixed be00bf9 from https://gitee.com/emancipator/yocto-meta-openeuler/pulls/1017 ok3568: fix patch to build linux-openeuler-rt * as rt patch have fix fpsimd.c printk.c, the old patch contain these two file are no longer fit, so we update this patch Signed-off-by: liangqifeng --- .../files/patches/0002-fix-fiq_debugger.patch | 65 ++----------------- 1 file changed, 7 insertions(+), 58 deletions(-) diff --git a/bsp/meta-rockchip/recipes-kernel/linux/files/patches/0002-fix-fiq_debugger.patch b/bsp/meta-rockchip/recipes-kernel/linux/files/patches/0002-fix-fiq_debugger.patch index 5d7b9548fa9..6281a47aa54 100644 --- a/bsp/meta-rockchip/recipes-kernel/linux/files/patches/0002-fix-fiq_debugger.patch +++ b/bsp/meta-rockchip/recipes-kernel/linux/files/patches/0002-fix-fiq_debugger.patch @@ -1,39 +1,14 @@ -From 03ae4a2fb5ee3854d8784391aefdc1abac4297ae Mon Sep 17 00:00:00 2001 -From: liangqifeng -Date: Wed, 15 Feb 2023 13:57:51 +0000 -Subject: [PATCH] fix fiq_debugger +From f33929fd617112ced8beb8a0e851f185e3f4a43a Mon Sep 17 00:00:00 2001 +From: zhuhai +Date: Thu, 23 Mar 2023 08:37:07 +0000 +Subject: [PATCH] fix-fiq_debugger --- - arch/arm64/kernel/fpsimd.c | 4 ++-- drivers/staging/android/fiq_debugger/fiq_debugger.c | 7 +++---- - include/linux/printk.h | 2 +- - kernel/printk/printk.c | 2 +- - 4 files changed, 7 insertions(+), 8 deletions(-) + 1 file changed, 3 insertions(+), 4 deletions(-) -diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c -index dbe196f38..da2413218 100644 ---- a/arch/arm64/kernel/fpsimd.c -+++ b/arch/arm64/kernel/fpsimd.c -@@ -244,7 +244,7 @@ static void *sve_free_atomic(struct task_struct *task) - */ - static void get_cpu_fpsimd_context(void) - { -- local_bh_disable(); -+ preempt_disable(); - __get_cpu_fpsimd_context(); - } - -@@ -265,7 +265,7 @@ static void __put_cpu_fpsimd_context(void) - static void put_cpu_fpsimd_context(void) - { - __put_cpu_fpsimd_context(); -- local_bh_enable(); -+ preempt_enable(); - } - - static bool have_cpu_fpsimd_context(void) diff --git a/drivers/staging/android/fiq_debugger/fiq_debugger.c b/drivers/staging/android/fiq_debugger/fiq_debugger.c -index 59bd0a841..c1b352982 100755 +index 59bd0a8410e8..c1b35298246c 100755 --- a/drivers/staging/android/fiq_debugger/fiq_debugger.c +++ b/drivers/staging/android/fiq_debugger/fiq_debugger.c @@ -263,12 +263,11 @@ static void fiq_debugger_dump_kernel_log(struct fiq_debugger_state *state) @@ -52,32 +27,6 @@ index 59bd0a841..c1b352982 100755 buf[len] = 0; fiq_debugger_puts(state, buf); } -diff --git a/include/linux/printk.h b/include/linux/printk.h -index 9331b131b..23946f482 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, ...); - void dump_stack_print_info(const char *log_lvl); - void show_regs_print_info(const char *log_lvl); - extern asmlinkage void dump_stack(void) __cold; --#if defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI) -+#if (defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)) && !defined(CONFIG_PREEMPT_RT) - 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 7859f42a6..d1a472283 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) - console_atomic_unlock(flags); - } - --#if defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI) -+#if (defined(CONFIG_X86) || defined(CONFIG_ARM64_PSEUDO_NMI)) && !defined(CONFIG_PREEMPT_RT) - void zap_locks(void) - { - if (raw_spin_is_locked(&logbuf_lock)) { -- -2.33.0 +2.36.1 -- Gitee