perf tools: Fix the build on the alpine:edge distro

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jul 31, 2018 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2018-07-31 06:03 UTC #0 lore raw

Commit-ID:  44fe619b1418ff4e9d2f9518a940fbe2fb686a08
Gitweb:     https://git.kernel.org/tip/44fe619b1418ff4e9d2f9518a940fbe2fb686a08
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Mon, 30 Jul 2018 13:15:03 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 30 Jul 2018 13:15:03 -0300

perf tools: Fix the build on the alpine:edge distro

The UAPI file byteorder/little_endian.h uses the __always_inline define without including the header where it is defined, linux/stddef.h, this ends up working in all the other distros because that file gets included seemingly by luck from one of the files included from little_endian.h.

But not on Alpine:edge, that fails for all files where perf_event.h is included but linux/stddef.h isn't include before that.

Adding the missing linux/stddef.h file where it breaks on Alpine:edge to fix that, in all other distros, that is just a very small header anyway.

Cc Adrian Hunter <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link https://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/arch/x86/util/pmu.c | 1 +
 tools/perf/arch/x86/util/tsc.c | 1 +
 tools/perf/perf.h              | 1 +
 tools/perf/util/header.h       | 1 +
 tools/perf/util/namespaces.h   | 1 +
 5 files changed, 5 insertions(+)

tools/perf/arch/x86/util/pmu.c +1 -0

index 63a74c32ddc5..e33ef5bc31c5 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <string.h>
 
+#include <linux/stddef.h>
 #include <linux/perf_event.h>
 
 #include "../../util/intel-pt.h"

tools/perf/arch/x86/util/tsc.c +1 -0

index 06bae7023a51..950539f9a4f7 100644
@@ -2,6 +2,7 @@
 #include <stdbool.h>
 #include <errno.h>
 
+#include <linux/stddef.h>
 #include <linux/perf_event.h>
 
 #include "../../perf.h"

tools/perf/perf.h +1 -0

index a1a97956136f..d215714f48df 100644
@@ -5,6 +5,7 @@
 #include <time.h>
 #include <stdbool.h>
 #include <linux/types.h>
+#include <linux/stddef.h>
 #include <linux/perf_event.h>
 
 extern bool test_attr__enabled;

tools/perf/util/header.h +1 -0

index 90d4577a92dc..6d7fe44aadc0 100644
@@ -2,6 +2,7 @@
 #ifndef __PERF_HEADER_H
 #define __PERF_HEADER_H
 
+#include <linux/stddef.h>
 #include <linux/perf_event.h>
 #include <sys/types.h>
 #include <stdbool.h>

tools/perf/util/namespaces.h +1 -0

index 760558dcfd18..cae1a9a39722 100644
@@ -10,6 +10,7 @@
 #define __PERF_NAMESPACES_H
 
 #include <sys/types.h>
+#include <linux/stddef.h>
 #include <linux/perf_event.h>
 #include <linux/refcount.h>
 #include <linux/types.h>