2016-05-17 22:40:10 +00:00
|
|
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
|
|
|
|
Subject: rbtree: don't include the rcu header
|
2016-06-19 21:11:38 +00:00
|
|
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.6/older/patches-4.6.2-rt5.tar.xz
|
2016-05-17 22:40:10 +00:00
|
|
|
|
|
|
|
|
|
|
The RCU header pulls in spinlock.h and fails due not yet defined types:
|
|
|
|
|
|
|
|
|
|
|
|
|In file included from include/linux/spinlock.h:275:0,
|
|
|
|
|
|
| from include/linux/rcupdate.h:38,
|
|
|
|
|
|
| from include/linux/rbtree.h:34,
|
|
|
|
|
|
| from include/linux/rtmutex.h:17,
|
|
|
|
|
|
| from include/linux/spinlock_types.h:18,
|
|
|
|
|
|
| from kernel/bounds.c:13:
|
|
|
|
|
|
|include/linux/rwlock_rt.h:16:38: error: unknown type name ‘rwlock_t’
|
|
|
|
|
|
| extern void __lockfunc rt_write_lock(rwlock_t *rwlock);
|
|
|
|
|
|
| ^
|
|
|
|
|
|
|
|
|
|
|
|
This patch moves the only RCU user from the header file into c file so the
|
|
|
|
|
|
inclusion can be avoided.
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
|
|
|
|
---
|
|
|
|
|
|
include/linux/rbtree.h | 11 ++---------
|
|
|
|
|
|
lib/rbtree.c | 11 +++++++++++
|
|
|
|
|
|
2 files changed, 13 insertions(+), 9 deletions(-)
|
|
|
|
|
|
|
|
|
|
|
|
--- a/include/linux/rbtree.h
|
|
|
|
|
|
+++ b/include/linux/rbtree.h
|
|
|
|
|
|
@@ -31,7 +31,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
|
|
#include <linux/stddef.h>
|
|
|
|
|
|
-#include <linux/rcupdate.h>
|
|
|
|
|
|
|
|
|
|
|
|
struct rb_node {
|
|
|
|
|
|
unsigned long __rb_parent_color;
|
|
|
|
|
|
@@ -86,14 +85,8 @@ static inline void rb_link_node(struct r
|
|
|
|
|
|
*rb_link = node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
-static inline void rb_link_node_rcu(struct rb_node *node, struct rb_node *parent,
|
|
|
|
|
|
- struct rb_node **rb_link)
|
|
|
|
|
|
-{
|
|
|
|
|
|
- node->__rb_parent_color = (unsigned long)parent;
|
|
|
|
|
|
- node->rb_left = node->rb_right = NULL;
|
|
|
|
|
|
-
|
|
|
|
|
|
- rcu_assign_pointer(*rb_link, node);
|
|
|
|
|
|
-}
|
|
|
|
|
|
+void rb_link_node_rcu(struct rb_node *node, struct rb_node *parent,
|
|
|
|
|
|
+ struct rb_node **rb_link);
|
|
|
|
|
|
|
|
|
|
|
|
#define rb_entry_safe(ptr, type, member) \
|
|
|
|
|
|
({ typeof(ptr) ____ptr = (ptr); \
|
|
|
|
|
|
--- a/lib/rbtree.c
|
|
|
|
|
|
+++ b/lib/rbtree.c
|
|
|
|
|
|
@@ -23,6 +23,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
#include <linux/rbtree_augmented.h>
|
|
|
|
|
|
#include <linux/export.h>
|
|
|
|
|
|
+#include <linux/rcupdate.h>
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
* red-black trees properties: http://en.wikipedia.org/wiki/Rbtree
|
|
|
|
|
|
@@ -590,3 +591,13 @@ struct rb_node *rb_first_postorder(const
|
|
|
|
|
|
return rb_left_deepest_node(root->rb_node);
|
|
|
|
|
|
}
|
|
|
|
|
|
EXPORT_SYMBOL(rb_first_postorder);
|
|
|
|
|
|
+
|
|
|
|
|
|
+void rb_link_node_rcu(struct rb_node *node, struct rb_node *parent,
|
|
|
|
|
|
+ struct rb_node **rb_link)
|
|
|
|
|
|
+{
|
|
|
|
|
|
+ node->__rb_parent_color = (unsigned long)parent;
|
|
|
|
|
|
+ node->rb_left = node->rb_right = NULL;
|
|
|
|
|
|
+
|
|
|
|
|
|
+ rcu_assign_pointer(*rb_link, node);
|
|
|
|
|
|
+}
|
|
|
|
|
|
+EXPORT_SYMBOL(rb_link_node_rcu);
|
