]>
Commit | Line | Data |
---|---|---|
e79f8d26 GKH |
1 | From 61a3c2244aa4378b19eb9516454352e79af909ef Mon Sep 17 00:00:00 2001 |
2 | From: Arnaldo Carvalho de Melo <acme@redhat.com> | |
3 | Date: Tue, 18 Apr 2017 11:42:23 -0300 | |
4 | Subject: perf tools: No need to include bitops.h in util.h | |
5 | ||
6 | From: Arnaldo Carvalho de Melo <acme@redhat.com> | |
7 | ||
8 | commit 6dcca6df4b73d409628c7b4464c63d4eb9d4d13a upstream. | |
9 | ||
10 | When we switched to the kernel's roundup_pow_of_two we forgot to remove | |
11 | this include from util.h, do it now. | |
12 | ||
13 | Cc: Adrian Hunter <adrian.hunter@intel.com> | |
14 | Cc: David Ahern <dsahern@gmail.com> | |
15 | Cc: Jiri Olsa <jolsa@kernel.org> | |
16 | Cc: Namhyung Kim <namhyung@kernel.org> | |
17 | Cc: Wang Nan <wangnan0@huawei.com> | |
18 | Fixes: 91529834d1de ("perf evlist: Use roundup_pow_of_two") | |
19 | Link: http://lkml.kernel.org/n/tip-kfye5rxivib6155cltx0bw4h@git.kernel.org | |
20 | Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> | |
21 | [bwh: Backported to 4.4 as dependency of "tools include: Adopt linux/bits.h": | |
22 | - Include <linux/compiler.h> in util/string.c to avoid build regression | |
23 | - Adjust context] | |
24 | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> | |
25 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
26 | --- | |
27 | tools/perf/util/string.c | 1 + | |
28 | tools/perf/util/util.h | 1 - | |
29 | 2 files changed, 1 insertion(+), 1 deletion(-) | |
30 | ||
31 | --- a/tools/perf/util/string.c | |
32 | +++ b/tools/perf/util/string.c | |
33 | @@ -1,4 +1,5 @@ | |
34 | #include "util.h" | |
35 | +#include <linux/compiler.h> | |
36 | #include "linux/string.h" | |
37 | ||
38 | #define K 1024LL | |
39 | --- a/tools/perf/util/util.h | |
40 | +++ b/tools/perf/util/util.h | |
41 | @@ -76,7 +76,6 @@ | |
42 | #include <sys/ttydefaults.h> | |
43 | #include <api/fs/tracing_path.h> | |
44 | #include <termios.h> | |
45 | -#include <linux/bitops.h> | |
46 | #include <termios.h> | |
47 | ||
48 | extern const char *graph_line; |