summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0166-locking-split-out-the-rbtree-definition.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0166-locking-split-out-the-rbtree-definition.patch')
-rw-r--r--debian/patches-rt/0166-locking-split-out-the-rbtree-definition.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0166-locking-split-out-the-rbtree-definition.patch b/debian/patches-rt/0166-locking-split-out-the-rbtree-definition.patch
index d8189ef50..c6e25ea4c 100644
--- a/debian/patches-rt/0166-locking-split-out-the-rbtree-definition.patch
+++ b/debian/patches-rt/0166-locking-split-out-the-rbtree-definition.patch
@@ -1,8 +1,8 @@
-From b9604fd91b7d02c92ddb504c330e1793f0694318 Mon Sep 17 00:00:00 2001
+From 2d36be607e18485adc15c129e7f5baa5eb7b8655 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 14 Aug 2020 17:08:41 +0200
Subject: [PATCH 166/323] locking: split out the rbtree definition
-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
rtmutex.h needs the definition for rb_root_cached. By including kernel.h
we will get to spinlock.h which requires rtmutex.h again.
@@ -19,7 +19,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
create mode 100644 include/linux/rbtree_type.h
diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
-index d7db17996322..c33b0e16d04b 100644
+index d7db179963221..c33b0e16d04b4 100644
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
@@ -19,19 +19,9 @@
@@ -67,7 +67,7 @@ index d7db17996322..c33b0e16d04b 100644
/* Same as rb_first(), but O(1) */
diff --git a/include/linux/rbtree_type.h b/include/linux/rbtree_type.h
new file mode 100644
-index 000000000000..77a89dd2c7c6
+index 0000000000000..77a89dd2c7c66
--- /dev/null
+++ b/include/linux/rbtree_type.h
@@ -0,0 +1,31 @@
@@ -103,7 +103,7 @@ index 000000000000..77a89dd2c7c6
+
+#endif
diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
-index add1dab27df5..b828b938c876 100644
+index add1dab27df52..b828b938c8769 100644
--- a/include/linux/rtmutex.h
+++ b/include/linux/rtmutex.h
@@ -14,7 +14,7 @@
@@ -116,5 +116,5 @@ index add1dab27df5..b828b938c876 100644
extern int max_lock_depth; /* for sysctl */
--
-2.43.0
+2.44.0