Re: [PATCH v2 07/12] rbtree: adjust root color in rb_insert_color() only when necessary
From: Adrian Hunter <adrian.hunter@intel.com>
Date: 2012-08-31 08:34:30
Also in:
lkml
Subsystem:
performance events subsystem, the rest · Maintainers:
Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Namhyung Kim, Linus Torvalds
On 31/08/12 11:15, Andrew Morton wrote:
On Fri, 31 Aug 2012 01:07:24 -0700 Michel Lespinasse [off-list ref] wrote:quoted
On Fri, Aug 31, 2012 at 1:01 AM, Adrian Hunter [off-list ref] wrote:quoted
This breaks tools/perf build in linux-next: ../../lib/rbtree.c: In function 'rb_insert_color': ../../lib/rbtree.c:95:9: error: 'true' undeclared (first use in this function) ../../lib/rbtree.c:95:9: note: each undeclared identifier is reported only once for each function it appears in ../../lib/rbtree.c: In function '__rb_erase_color': ../../lib/rbtree.c:216:9: error: 'true' undeclared (first use in this function) ../../lib/rbtree.c: In function 'rb_erase': ../../lib/rbtree.c:368:2: error: unknown type name 'bool' make: *** [util/rbtree.o] Error 1I thought Andrew had a patch rbtree-adjust-root-color-in-rb_insert_color-only-when-necessary-fix-perf-compilation that fixed this though a Makefile change ?Yup. But it's unclear why we should include the header via the cc command line?
Dunno AFAICS tools/perf/util/include/linux is for fixing up the differences between kernel headers and exported kernel headers. Hence my change:
diff --git a/tools/perf/util/include/linux/rbtree.h b/tools/perf/util/include/linux/rbtree.h
index 7a243a1..2a030c5 100644
--- a/tools/perf/util/include/linux/rbtree.h
+++ b/tools/perf/util/include/linux/rbtree.h@@ -1 +1,2 @@ +#include <stdbool.h> #include "../../../../include/linux/rbtree.h"
Alex?
quoted hunk ↗ jump to hunk
From: Alexander Shishkin <alexander.shishkin@linux.intel.com> Subject: rbtree-adjust-root-color-in-rb_insert_color-only-when-necessary-fix-perf-compilation Commit 2cfaf9cc68190c24fdd05e4d104099b3f27c7a44 (rbtree: adjust root color in rb_insert_color() only when necessary) introduces bool type and constants to the rbtree.c, and breaks compilation of tools/perf: ../../lib/rbtree.c: In function `rb_insert_color': ../../lib/rbtree.c:95:9: error: `true' undeclared (first use in this function) ../../lib/rbtree.c:95:9: note: each undeclared identifier is reported only once or each function it appears in ../../lib/rbtree.c: In function `__rb_erase_color': ../../lib/rbtree.c:216:9: error: `true' undeclared (first use in this function) ../../lib/rbtree.c: In function `rb_erase': ../../lib/rbtree.c:368:2: error: unknown type name `bool' make: *** [util/rbtree.o] Error 1 This patch is the easiest solution I can think of. Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com> Acked-by: Michel Lespinasse <redacted> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- tools/perf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN tools/perf/Makefile~rbtree-adjust-root-color-in-rb_insert_color-only-when-necessary-fix-perf-compilation tools/perf/Makefile--- a/tools/perf/Makefile~rbtree-adjust-root-color-in-rb_insert_color-only-when-necessary-fix-perf-compilation +++ a/tools/perf/Makefile@@ -806,7 +806,7 @@ $(OUTPUT)ui/browsers/map.o: ui/browsers/ $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $< $(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS - $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< + $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' -include stdbool.h $< $(OUTPUT)util/parse-events.o: util/parse-events.c $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-redundant-decls $<_
-- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>