[tip:perf/urgent] tools: Copy rbtree_augmented.h from the kernel

[tip:perf/urgent] tools: Copy rbtree_augmented.h from the kernel

[tip-bot for Arnaldo Carvalho de Melo]

Commit-ID:  307bc971959aaa2df44032e7f6b0bda1f7e26890
Gitweb:     http://git.kernel.org/tip/307bc971959aaa2df44032e7f6b0bda1f7e26890
Author:     Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Sun, 5 Jul 2015 22:59:05 -0300
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Sun, 5 Jul 2015 22:59:05 -0300

tools: Copy rbtree_augmented.h from the kernel

To complete the transitioning to not to share the same files with the
kernel, also moving it from tools/perf/include/linux/ to
tools/include/linux to make the whoke rbtree kit to other tools/ living
codebases.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-5bxyehixafckqm6ez25alnfo@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 {include => tools/include}/linux/rbtree_augmented.h | 9 ++++++---
 tools/perf/MANIFEST                                 | 2 +-
 tools/perf/util/include/linux/rbtree_augmented.h    | 2 --
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/linux/rbtree_augmented.h b/tools/include/linux/rbtree_augmented.h
similarity index 97%
copy from include/linux/rbtree_augmented.h
copy to tools/include/linux/rbtree_augmented.h
index 378c5ee..43be941 100644
--- a/include/linux/rbtree_augmented.h
+++ b/tools/include/linux/rbtree_augmented.h
@@ -18,11 +18,14 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+  tools/linux/include/linux/rbtree_augmented.h
+
+  Copied from:
   linux/include/linux/rbtree_augmented.h
 */
 
-#ifndef _LINUX_RBTREE_AUGMENTED_H
-#define _LINUX_RBTREE_AUGMENTED_H
+#ifndef _TOOLS_LINUX_RBTREE_AUGMENTED_H
+#define _TOOLS_LINUX_RBTREE_AUGMENTED_H
 
 #include <linux/compiler.h>
 #include <linux/rbtree.h>
@@ -239,4 +242,4 @@ rb_erase_augmented(struct rb_node *node, struct rb_root *root,
 		__rb_erase_color(rebalance, root, augment->rotate);
 }
 
-#endif	/* _LINUX_RBTREE_AUGMENTED_H */
+#endif	/* _TOOLS_LINUX_RBTREE_AUGMENTED_H */
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
index 9df2681..09dc0aa 100644
--- a/tools/perf/MANIFEST
+++ b/tools/perf/MANIFEST
@@ -46,6 +46,7 @@ tools/include/linux/list.h
 tools/include/linux/log2.h
 tools/include/linux/poison.h
 tools/include/linux/rbtree.h
+tools/include/linux/rbtree_augmented.h
 tools/include/linux/types.h
 include/asm-generic/bitops/arch_hweight.h
 include/asm-generic/bitops/const_hweight.h
@@ -65,7 +66,6 @@ arch/*/lib/memcpy*.S
 arch/*/lib/memset*.S
 include/linux/poison.h
 include/linux/hw_breakpoint.h
-include/linux/rbtree_augmented.h
 include/uapi/linux/perf_event.h
 include/uapi/linux/const.h
 include/uapi/linux/swab.h
diff --git a/tools/perf/util/include/linux/rbtree_augmented.h b/tools/perf/util/include/linux/rbtree_augmented.h
deleted file mode 100644
index 9d6fcdf..0000000
--- a/tools/perf/util/include/linux/rbtree_augmented.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <stdbool.h>
-#include "../../../../include/linux/rbtree_augmented.h"