Commit-ID: 3f735377bfd6567d80815a6242c147211963680a
Gitweb: http://git.kernel.org/tip/3f735377bfd6567d80815a6242c147211963680a
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
AuthorDate: Sun, 5 Jul 2015 22:48:21 -0300
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Sun, 5 Jul 2015 22:48:21 -0300
tools: Copy lib/rbtree.c to tools/lib/
So that we can remove kernel specific stuff we've been stubbing out via
a tools/include/linux/export.h that gets removed in this patch and to
avoid breakages in the future like the one fixed recently where
rcupdate.h started being used in rbtree.h.
Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Link: http://lkml.kernel.org/n/tip-rxuzfsozpb8hv1emwpx06rm6@xxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/include/linux/export.h | 10 ----------
{lib => tools/lib}/rbtree.c | 16 ++--------------
tools/perf/MANIFEST | 2 +-
tools/perf/util/Build | 2 +-
4 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/tools/include/linux/export.h b/tools/include/linux/export.h
deleted file mode 100644
index d07e586..0000000
--- a/tools/include/linux/export.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _TOOLS_LINUX_EXPORT_H_
-#define _TOOLS_LINUX_EXPORT_H_
-
-#define EXPORT_SYMBOL(sym)
-#define EXPORT_SYMBOL_GPL(sym)
-#define EXPORT_SYMBOL_GPL_FUTURE(sym)
-#define EXPORT_UNUSED_SYMBOL(sym)
-#define EXPORT_UNUSED_SYMBOL_GPL(sym)
-
-#endif
diff --git a/lib/rbtree.c b/tools/lib/rbtree.c
similarity index 97%
copy from lib/rbtree.c
copy to tools/lib/rbtree.c
index c16c81a..17c2b59 100644
--- a/lib/rbtree.c
+++ b/tools/lib/rbtree.c
@@ -22,7 +22,6 @@
*/
#include <linux/rbtree_augmented.h>
-#include <linux/export.h>
/*
* red-black trees properties: http://en.wikipedia.org/wiki/Rbtree
@@ -366,7 +365,6 @@ void __rb_erase_color(struct rb_node *parent, struct rb_root *root,
{
____rb_erase_color(parent, root, augment_rotate);
}
-EXPORT_SYMBOL(__rb_erase_color);
/*
* Non-augmented rbtree manipulation functions.
@@ -387,7 +385,6 @@ void rb_insert_color(struct rb_node *node, struct rb_root *root)
{
__rb_insert(node, root, dummy_rotate);
}
-EXPORT_SYMBOL(rb_insert_color);
void rb_erase(struct rb_node *node, struct rb_root *root)
{
@@ -396,7 +393,6 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
if (rebalance)
____rb_erase_color(rebalance, root, dummy_rotate);
}
-EXPORT_SYMBOL(rb_erase);
/*
* Augmented rbtree manipulation functions.
@@ -410,7 +406,6 @@ void __rb_insert_augmented(struct rb_node *node, struct rb_root *root,
{
__rb_insert(node, root, augment_rotate);
}
-EXPORT_SYMBOL(__rb_insert_augmented);
/*
* This function returns the first node (in sort order) of the tree.
@@ -426,7 +421,6 @@ struct rb_node *rb_first(const struct rb_root *root)
n = n->rb_left;
return n;
}
-EXPORT_SYMBOL(rb_first);
struct rb_node *rb_last(const struct rb_root *root)
{
@@ -439,7 +433,6 @@ struct rb_node *rb_last(const struct rb_root *root)
n = n->rb_right;
return n;
}
-EXPORT_SYMBOL(rb_last);
struct rb_node *rb_next(const struct rb_node *node)
{
@@ -453,7 +446,7 @@ struct rb_node *rb_next(const struct rb_node *node)
* as we can.
*/
if (node->rb_right) {
- node = node->rb_right;
+ node = node->rb_right;
while (node->rb_left)
node=node->rb_left;
return (struct rb_node *)node;
@@ -471,7 +464,6 @@ struct rb_node *rb_next(const struct rb_node *node)
return parent;
}
-EXPORT_SYMBOL(rb_next);
struct rb_node *rb_prev(const struct rb_node *node)
{
@@ -485,7 +477,7 @@ struct rb_node *rb_prev(const struct rb_node *node)
* as we can.
*/
if (node->rb_left) {
- node = node->rb_left;
+ node = node->rb_left;
while (node->rb_right)
node=node->rb_right;
return (struct rb_node *)node;
@@ -500,7 +492,6 @@ struct rb_node *rb_prev(const struct rb_node *node)
return parent;
}
-EXPORT_SYMBOL(rb_prev);
void rb_replace_node(struct rb_node *victim, struct rb_node *new,
struct rb_root *root)
@@ -517,7 +508,6 @@ void rb_replace_node(struct rb_node *victim, struct rb_node *new,
/* Copy the pointers/colour from the victim to the replacement */
*new = *victim;
}
-EXPORT_SYMBOL(rb_replace_node);
static struct rb_node *rb_left_deepest_node(const struct rb_node *node)
{
@@ -548,7 +538,6 @@ struct rb_node *rb_next_postorder(const struct rb_node *node)
* should be next */
return (struct rb_node *)parent;
}
-EXPORT_SYMBOL(rb_next_postorder);
struct rb_node *rb_first_postorder(const struct rb_root *root)
{
@@ -557,4 +546,3 @@ struct rb_node *rb_first_postorder(const struct rb_root *root)
return rb_left_deepest_node(root->rb_node);
}
-EXPORT_SYMBOL(rb_first_postorder);
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
index 6504b72..ff667e3 100644
--- a/tools/perf/MANIFEST
+++ b/tools/perf/MANIFEST
@@ -18,6 +18,7 @@ tools/arch/x86/include/asm/atomic.h
tools/arch/x86/include/asm/rmwcc.h
tools/lib/traceevent
tools/lib/api
+tools/lib/rbtree.c
tools/lib/symbol/kallsyms.c
tools/lib/symbol/kallsyms.h
tools/lib/util/find_next_bit.c
@@ -55,7 +56,6 @@ include/linux/list.h
include/linux/hash.h
include/linux/stringify.h
lib/hweight.c
-lib/rbtree.c
include/linux/swab.h
arch/*/include/asm/unistd*.h
arch/*/include/uapi/asm/unistd*.h
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 586a59d..601d114 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -139,7 +139,7 @@ $(OUTPUT)util/find_next_bit.o: ../lib/util/find_next_bit.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)
-$(OUTPUT)util/rbtree.o: ../../lib/rbtree.c FORCE
+$(OUTPUT)util/rbtree.o: ../lib/rbtree.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)
--
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
|