Commit 7d380c8f authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

perf: Fix UAPI fallout



The UAPI commits forgot to test tooling builds such as tools/perf/,
and this fixes the fallout.

Manual conversion.
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3d6ee36d
......@@ -252,10 +252,10 @@ $(OUTPUT)util/pmu.o: $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c
LIB_FILE=$(OUTPUT)libperf.a
LIB_H += ../../include/linux/perf_event.h
LIB_H += ../../include/uapi/linux/perf_event.h
LIB_H += ../../include/linux/rbtree.h
LIB_H += ../../include/linux/list.h
LIB_H += ../../include/linux/const.h
LIB_H += ../../include/uapi/linux/const.h
LIB_H += ../../include/linux/hash.h
LIB_H += ../../include/linux/stringify.h
LIB_H += util/include/linux/bitmap.h
......
......@@ -112,7 +112,7 @@ void get_term_dimensions(struct winsize *ws);
#include <sys/types.h>
#include <sys/syscall.h>
#include "../../include/linux/perf_event.h"
#include "../../include/uapi/linux/perf_event.h"
#include "util/types.h"
#include <stdbool.h>
......
......@@ -19,7 +19,7 @@
#include "thread_map.h"
#include "target.h"
#include "../../../include/linux/hw_breakpoint.h"
#include "../../include/linux/perf_event.h"
#include "../../../include/uapi/linux/perf_event.h"
#include "perf_regs.h"
#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
......
......@@ -3,7 +3,7 @@
#include <linux/list.h>
#include <stdbool.h>
#include "../../../include/linux/perf_event.h"
#include "../../../include/uapi/linux/perf_event.h"
#include "types.h"
#include "xyarray.h"
#include "cgroup.h"
......
#ifndef __PERF_HEADER_H
#define __PERF_HEADER_H
#include "../../../include/linux/perf_event.h"
#include "../../../include/uapi/linux/perf_event.h"
#include <sys/types.h>
#include <stdbool.h>
#include "types.h"
......
#include <asm/types.h>
#include "../../../../include/linux/swab.h"
#include "../../../../include/uapi/linux/swab.h"
#include "../../../../include/linux/const.h"
#include "../../../../include/uapi/linux/const.h"
......@@ -7,7 +7,7 @@
#include <linux/list.h>
#include <stdbool.h>
#include "types.h"
#include "../../../include/linux/perf_event.h"
#include "../../../include/uapi/linux/perf_event.h"
#include "types.h"
struct list_head;
......
......@@ -2,7 +2,7 @@
#define __PMU_H
#include <linux/bitops.h>
#include "../../../include/linux/perf_event.h"
#include "../../../include/uapi/linux/perf_event.h"
enum {
PERF_PMU_FORMAT_VALUE_CONFIG,
......
......@@ -7,7 +7,7 @@
#include "symbol.h"
#include "thread.h"
#include <linux/rbtree.h>
#include "../../../include/linux/perf_event.h"
#include "../../../include/uapi/linux/perf_event.h"
struct sample_queue;
struct ip_callchain;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment