summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0017-printk-nbcon-Add-helper-to-assign-priority-based-on-.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-07 13:18:09 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-07 13:18:13 +0000
commit225809f918c2f2c9c831ea16ddb9b81485af5f34 (patch)
tree5332d51631f39fc96804d8001996f028bbbbdf54 /debian/patches-rt/0017-printk-nbcon-Add-helper-to-assign-priority-based-on-.patch
parentMerging upstream version 6.10.3. (diff)
downloadlinux-225809f918c2f2c9c831ea16ddb9b81485af5f34.tar.xz
linux-225809f918c2f2c9c831ea16ddb9b81485af5f34.zip
Merging debian version 6.10.3-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0017-printk-nbcon-Add-helper-to-assign-priority-based-on-.patch')
-rw-r--r--debian/patches-rt/0017-printk-nbcon-Add-helper-to-assign-priority-based-on-.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches-rt/0017-printk-nbcon-Add-helper-to-assign-priority-based-on-.patch b/debian/patches-rt/0017-printk-nbcon-Add-helper-to-assign-priority-based-on-.patch
index 0fda8a8c5e..a7cb342ff6 100644
--- a/debian/patches-rt/0017-printk-nbcon-Add-helper-to-assign-priority-based-on-.patch
+++ b/debian/patches-rt/0017-printk-nbcon-Add-helper-to-assign-priority-based-on-.patch
@@ -1,8 +1,8 @@
From: John Ogness <john.ogness@linutronix.de>
Date: Thu, 14 Dec 2023 14:38:42 +0000
-Subject: [PATCH 17/46] printk: nbcon: Add helper to assign priority based on
+Subject: [PATCH 17/48] printk: nbcon: Add helper to assign priority based on
CPU state
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.9/older/patches-6.9-rt5.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.10/older/patches-6.10.2-rt14.tar.xz
Add a helper function to use the current state of the CPU to
determine which priority to assign to the printing context.
@@ -10,7 +10,7 @@ determine which priority to assign to the printing context.
The EMERGENCY priority handling is added in a follow-up commit.
It will use a per-CPU variable.
-Note: nbcon_driver_try_acquire(), which is used by console
+Note: nbcon_device_try_acquire(), which is used by console
drivers to acquire the nbcon console for non-printing
activities, will always use NORMAL priority.