From: Arnaldo Carvalho de Melo Date: Tue, 18 Apr 2017 14:42:23 +0000 (-0300) Subject: perf tools: No need to include bitops.h in util.h X-Git-Tag: v4.4.181~153 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed2faf464d9b8e14969f601210a952b696f62fca;p=thirdparty%2Fkernel%2Fstable.git perf tools: No need to include bitops.h in util.h commit 6dcca6df4b73d409628c7b4464c63d4eb9d4d13a upstream. When we switched to the kernel's roundup_pow_of_two we forgot to remove this include from util.h, do it now. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Fixes: 91529834d1de ("perf evlist: Use roundup_pow_of_two") Link: http://lkml.kernel.org/n/tip-kfye5rxivib6155cltx0bw4h@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo [bwh: Backported to 4.4 as dependency of "tools include: Adopt linux/bits.h": - Include in util/string.c to avoid build regression - Adjust context] Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- diff --git a/tools/perf/util/string.c b/tools/perf/util/string.c index accb7ece1d3cb..3d7af024c73fd 100644 --- a/tools/perf/util/string.c +++ b/tools/perf/util/string.c @@ -1,4 +1,5 @@ #include "util.h" +#include #include "linux/string.h" #define K 1024LL diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index dcc659017976d..ee5d1dfe13da0 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -76,7 +76,6 @@ #include #include #include -#include #include extern const char *graph_line;