summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-01-05 10:33:02 +0300
committerIngo Molnar <mingo@kernel.org>2017-01-05 10:33:02 +0300
commit4e06d4f083d6b485d689948479d5b2052917373d (patch)
treeb100fbc57357f4c8b546b354e166ddf812ac694c /samples
parent0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (diff)
parent8a937a25a7e3c19d5fb3f9d92f605cf5fda219d8 (diff)
downloadlinux-4e06d4f083d6b485d689948479d5b2052917373d.tar.xz
Merge tag 'perf-urgent-for-mingo-4.10-20170104' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes and one improvement from Arnaldo Carvalho de Melo: Fixes: - Fix prev/next_prio formatting for deadline tasks in libtraceevent (Daniel Bristot de Oliveira) - Robustify reading of build-ids from /sys/kernel/note (Arnaldo Carvalho de Melo) - Fix building some sample/bpf in Alpine Linux 3.4 (Arnaldo Carvalho de Melo) - Fix 'make install-bin' to install libtraceevent plugins (Arnaldo Carvalho de Melo) - Fix 'perf record --switch-output' documentation and comment (Jiri Olsa) - Fix 'perf probe' for cross arch probing (Masami Hiramatsu) Improvement: - Show total scheduling time in 'perf sched timehist' (Namhyumg Kim) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'samples')
-rw-r--r--samples/bpf/sock_example.h2
-rw-r--r--samples/bpf/trace_output_user.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/samples/bpf/sock_example.h b/samples/bpf/sock_example.h
index 09f7fe7e5fd7..d8014065d479 100644
--- a/samples/bpf/sock_example.h
+++ b/samples/bpf/sock_example.h
@@ -4,7 +4,7 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <net/ethernet.h>
+#include <linux/if_ether.h>
#include <net/if.h>
#include <linux/if_packet.h>
#include <arpa/inet.h>
diff --git a/samples/bpf/trace_output_user.c b/samples/bpf/trace_output_user.c
index f4fa6af22def..ccca1e348017 100644
--- a/samples/bpf/trace_output_user.c
+++ b/samples/bpf/trace_output_user.c
@@ -9,7 +9,6 @@
#include <string.h>
#include <fcntl.h>
#include <poll.h>
-#include <sys/ioctl.h>
#include <linux/perf_event.h>
#include <linux/bpf.h>
#include <errno.h>