Commit-ID: 1b9784b509ff42c97b22ff7e7a0faa092c98eefc
Gitweb: http://git.kernel.org/tip/1b9784b509ff42c97b22ff7e7a0faa092c98eefc
Author: Ingo Molnar <mingo@xxxxxxxxxx>
AuthorDate: Thu, 15 Oct 2015 13:52:32 +0200
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Thu, 15 Oct 2015 13:57:57 +0200
tools/kvm: Add private rbtree.h variant
Recent kernels started including rcupdate.h in rbtree.h, which brings in
a whole host of kernel headers and breaks the kvmtool build.
Instead of trying to play never ending catch-up with kernel changes,
import the rbtree header instead.
We'll eventually want to use the librarized, user-space rbtree version
that perf added to tools/lib/, but we cannot do this right now,
because kvmtool extended upon rbtree semantics with the rbtree-interval
code.
So do a simple import for now.
Cc: Pekka Enberg <penberg@xxxxxx>
Cc: linux-kernel@xxxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
{include => tools/kvm/include}/linux/rbtree.h | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/include/linux/rbtree.h b/tools/kvm/include/linux/rbtree.h
similarity index 93%
copy from include/linux/rbtree.h
copy to tools/kvm/include/linux/rbtree.h
index 830c499..687325a 100644
--- a/include/linux/rbtree.h
+++ b/tools/kvm/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,15 +85,6 @@ static inline void rb_link_node(struct rb_node *node, struct rb_node *parent,
*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);
-}
-
#define rb_entry_safe(ptr, type, member) \
({ typeof(ptr) ____ptr = (ptr); \
____ptr ? rb_entry(____ptr, type, member) : NULL; \
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|