From f87e448b68f22aec3c5a25e9c5e4081c4bd3c982 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 9 Dec 2024 17:47:09 +0800 Subject: [PATCH] kernel-rt:update to 6.6.0-62.0.0.7 && rpi-rt:update to 6.6.0.62.3.0 --- 0001-raspberrypi-kernel-RT.patch | 7 ++++--- kernel-rt.spec | 9 ++++++--- patch-6.6.0-6.0.0-rt20.patch | 2 +- raspberrypi-kernel-rt.spec | 7 +++++-- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/0001-raspberrypi-kernel-RT.patch b/0001-raspberrypi-kernel-RT.patch index 42ce95d..fa1cffa 100644 --- a/0001-raspberrypi-kernel-RT.patch +++ b/0001-raspberrypi-kernel-RT.patch @@ -7552,12 +7552,13 @@ index 8ff0efac6..398104760 100644 } uart_port_deref(port); } -@@ -1108,9 +1108,9 @@ static int uart_tiocmget(struct tty_struct *tty) +@@ -1107,10 +1107,10 @@ static int uart_tiocmget(struct tty_struct *tty) + goto out; if (!tty_io_error(tty)) { - result = uport->mctrl; - spin_lock_irq(&uport->lock); + uart_port_lock_irq(uport); + result = uport->mctrl; result |= uport->ops->get_mctrl(uport); - spin_unlock_irq(&uport->lock); + uart_port_unlock_irq(uport); @@ -15199,7 +15200,7 @@ index d5ae744de..51cc50a7e 100644 + if (need_resched()) return; - /* Idle tasks are by definition preempted by non-idle tasks. */ + if (!sched_feat(WAKEUP_PREEMPTION)) @@ -9356,7 +9372,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_ return; diff --git a/kernel-rt.spec b/kernel-rt.spec index f067849..f7f470e 100644 --- a/kernel-rt.spec +++ b/kernel-rt.spec @@ -41,10 +41,10 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig %global upstream_version 6.6 %global upstream_sublevel 0 -%global devel_release 59 +%global devel_release 62 %global maintenance_release .0.0 -%global pkg_release .6 -%global rt_release .rt44 +%global pkg_release .7 +%global rt_release .rt47 %define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -1058,6 +1058,9 @@ fi %endif %changelog +* Mon Dec 09 2024 zhangyu - 6.6.0-62.0.0.7 +- update kernel-rt version to 6.6.0-62.0.0.7 + * Tue Dec 03 2024 zhangyu - 6.6.0-59.0.0.6 - update kernel-rt version to 6.6.0-59.0.0.6 diff --git a/patch-6.6.0-6.0.0-rt20.patch b/patch-6.6.0-6.0.0-rt20.patch index 8d53507..4d5c8ad 100644 --- a/patch-6.6.0-6.0.0-rt20.patch +++ b/patch-6.6.0-6.0.0-rt20.patch @@ -15228,7 +15228,7 @@ index d5ae744de..51cc50a7e 100644 + if (need_resched()) return; - /* Idle tasks are by definition preempted by non-idle tasks. */ + if (!sched_feat(WAKEUP_PREEMPTION)) @@ -9356,7 +9372,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_ return; diff --git a/raspberrypi-kernel-rt.spec b/raspberrypi-kernel-rt.spec index e53f058..e21e66f 100644 --- a/raspberrypi-kernel-rt.spec +++ b/raspberrypi-kernel-rt.spec @@ -2,13 +2,13 @@ %global KernelVer %{version}-%{release}.raspi.%{_target_cpu} -%global hulkrelease 53.0.0 +%global hulkrelease 62.0.0 %global debug_package %{nil} Name: raspberrypi-kernel-rt Version: 6.6.0 -Release: %{hulkrelease}.rt44.2 +Release: %{hulkrelease}.rt47.3 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ @@ -265,6 +265,9 @@ fi %changelog +* Mon Dec 09 2024 zhangyu - 6.6.0.62.0.3 +- - update Rpi:preempt-RT to openEuler 6.6.0.62.3.0 + * Wed May 15 2024 zhangyu - 6.6.0.53.0.2 - - update Rpi:preempt-RT to openEuler 6.6.0.53.2.0