From 30c4ae2eedacfbb99ce91d04f6232e7c26e498dd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 8 May 2024 19:45:38 +0200 Subject: Merging debian version 5.10.216-1. Signed-off-by: Daniel Baumann --- debian/patches-rt/0123-preempt-Cleanup-the-macro-maze-a-bit.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian/patches-rt/0123-preempt-Cleanup-the-macro-maze-a-bit.patch') diff --git a/debian/patches-rt/0123-preempt-Cleanup-the-macro-maze-a-bit.patch b/debian/patches-rt/0123-preempt-Cleanup-the-macro-maze-a-bit.patch index 9e6469ec2..92a26bd92 100644 --- a/debian/patches-rt/0123-preempt-Cleanup-the-macro-maze-a-bit.patch +++ b/debian/patches-rt/0123-preempt-Cleanup-the-macro-maze-a-bit.patch @@ -1,8 +1,8 @@ -From b743317882baa4d44bdc55dea99865bf53623193 Mon Sep 17 00:00:00 2001 +From 1f654286ac50aa5942060888969cfe1fdc9dd507 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 13 Nov 2020 15:02:17 +0100 Subject: [PATCH 123/323] preempt: Cleanup the macro maze a bit -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz Make the macro maze consistent and prepare it for adding the RT variant for BH accounting. @@ -22,7 +22,7 @@ Signed-off-by: Sebastian Andrzej Siewior 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/include/linux/preempt.h b/include/linux/preempt.h -index 6df63cbe8bb0..69cc8b64aa3a 100644 +index 6df63cbe8bb04..69cc8b64aa3a0 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -77,31 +77,33 @@ @@ -74,5 +74,5 @@ index 6df63cbe8bb0..69cc8b64aa3a 100644 /* * The preempt_count offset after preempt_disable(); -- -2.43.0 +2.44.0 -- cgit v1.2.3