diff --git a/kernel-rt.spec b/kernel-rt.spec index 7a622f5..f067849 100644 --- a/kernel-rt.spec +++ b/kernel-rt.spec @@ -14,6 +14,7 @@ {error:clang_lto requires --with toolchain_clang} %endif + %define modsign_cmd %{SOURCE10} %if 0%{?openEuler_sign_rsa} @@ -40,9 +41,9 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig %global upstream_version 6.6 %global upstream_sublevel 0 -%global devel_release 53 +%global devel_release 59 %global maintenance_release .0.0 -%global pkg_release .5 +%global pkg_release .6 %global rt_release .rt44 %define with_debuginfo 1 @@ -1057,6 +1058,9 @@ fi %endif %changelog +* Tue Dec 03 2024 zhangyu - 6.6.0-59.0.0.6 +- update kernel-rt version to 6.6.0-59.0.0.6 + * Tue Nov 11 2024 zhangyu - 6.6.0-53.0.0.5 - update kernel-rt version to 6.6.0-53.0.0.5 diff --git a/patch-6.6.0-6.0.0-rt20.patch b/patch-6.6.0-6.0.0-rt20.patch index 930eac4..8d53507 100644 --- a/patch-6.6.0-6.0.0-rt20.patch +++ b/patch-6.6.0-6.0.0-rt20.patch @@ -7580,12 +7580,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);