Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

tools/perf/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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

tools/perf/perf.h

+1 −1
Original line number Diff line number Diff line
@@ -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>

tools/perf/util/evsel.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

tools/perf/util/evsel.h

+1 −1
Original line number Diff line number Diff line
@@ -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"

tools/perf/util/header.h

+1 −1
Original line number Diff line number Diff line 
#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"