diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-04-24 23:31:35 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-04-24 23:31:35 +0200 |
commit | fd7647979a3948dae4fc6f25dbbdf9ba269bed78 (patch) | |
tree | 3564d53e2242beb9616ad050a6142de689cf814a /tools/include/linux/log2.h | |
parent | e720c19e0d5412f45736d62258d21dc7b056c4ad (diff) | |
parent | 9d43f5e8df6804ae271407500af9062e9278167a (diff) | |
download | linux-fd7647979a3948dae4fc6f25dbbdf9ba269bed78.tar.gz linux-fd7647979a3948dae4fc6f25dbbdf9ba269bed78.tar.bz2 linux-fd7647979a3948dae4fc6f25dbbdf9ba269bed78.zip |
Merge tag 'perf-core-for-mingo-4.12-20170424' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
User visible changes:
- Fix display of data source snoop indication in 'perf mem' (Andi Kleen)
- Fix the code to strip command name from /proc/PID/stat (Jiri Olsa)
Infrastructure changes:
- Continue the disentanglement of headers, specially util.h (Arnaldo Carvalho de Melo)
- Synchronize some header files with the kernel (Arnaldo Carvalho de Melo)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/include/linux/log2.h')
-rw-r--r-- | tools/include/linux/log2.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/include/linux/log2.h b/tools/include/linux/log2.h index d5677d39c1e4..0325cefc2220 100644 --- a/tools/include/linux/log2.h +++ b/tools/include/linux/log2.h @@ -12,6 +12,9 @@ #ifndef _TOOLS_LINUX_LOG2_H #define _TOOLS_LINUX_LOG2_H +#include <linux/bitops.h> +#include <linux/types.h> + /* * non-constant log of base 2 calculators * - the arch may override these in asm/bitops.h if they can be implemented |