dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ingo Molnar 2012-10-14 10:40:57 +02:00 committed by Linus Torvalds
parent 3d6ee36dfb
commit 7d380c8f1e
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/perf/Makefile
View File

@ -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

2
tools/perf/perf.h
View File

@ -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>

2
tools/perf/util/evsel.c
View File

@ -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))

2
tools/perf/util/evsel.h
View File

@ -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"

2
tools/perf/util/header.h
View File

@ -1,7 +1,7 @@
#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"

2
tools/perf/util/include/asm/byteorder.h
View File

@ -1,2 +1,2 @@
#include <asm/types.h>
#include "../../../../include/linux/swab.h"
#include "../../../../include/uapi/linux/swab.h"

2
tools/perf/util/include/linux/const.h
View File

@ -1 +1 @@
#include "../../../../include/linux/const.h"
#include "../../../../include/uapi/linux/const.h"

2
tools/perf/util/parse-events.h
View File

@ -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
tools/perf/util/pmu.h
View File

@ -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,

2
tools/perf/util/session.h
View File

@ -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;