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

Commit cec07f53 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Move syscall number fallbacks from perf-sys.h to tools/arch/x86/include/asm/ 

And remove the empty tools/arch/x86/include/asm/unistd_{32,64}.h files
introduced by eae7a755 ("perf tools, x86: Build perf on older
user-space as well").

This way we get closer to mirroring the kernel for cases where __NR_
can't be found for some include path/_GNU_SOURCE/whatever scenario.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-kpj6m3mbjw82kg6krk2z529e@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 9c304f6c

tools/arch/x86/include/asm/unistd_32.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#ifndef __NR_perf_event_open

# define __NR_perf_event_open 336

#endif

#ifndef __NR_futex

# define __NR_futex 240

#endif

#ifndef __NR_gettid

# define __NR_gettid 224

#endif

tools/arch/x86/include/asm/unistd_64.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#ifndef __NR_perf_event_open

# define __NR_perf_event_open 298

#endif

#ifndef __NR_futex

# define __NR_futex 202

#endif

#ifndef __NR_gettid

# define __NR_gettid 186

#endif

tools/perf/config/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ CFLAGS += -I$(src-perf)/arch/$(ARCH)/include 
CFLAGS += -I$(srctree)/tools/include/

CFLAGS += -I$(srctree)/arch/$(ARCH)/include/uapi

CFLAGS += -I$(srctree)/arch/$(ARCH)/include

CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/include

CFLAGS += -I$(srctree)/include/uapi

CFLAGS += -I$(srctree)/include

tools/perf/perf-sys.h

+0 −18
Original line number Diff line number Diff line
@@ -11,29 +11,11 @@ 
#if defined(__i386__)

#define cpu_relax()	asm volatile("rep; nop" ::: "memory");

#define CPUINFO_PROC	{"model name"}

#ifndef __NR_perf_event_open

# define __NR_perf_event_open 336

#endif

#ifndef __NR_futex

# define __NR_futex 240

#endif

#ifndef __NR_gettid

# define __NR_gettid 224

#endif

#endif



#if defined(__x86_64__)

#define cpu_relax()	asm volatile("rep; nop" ::: "memory");

#define CPUINFO_PROC	{"model name"}

#ifndef __NR_perf_event_open

# define __NR_perf_event_open 298

#endif

#ifndef __NR_futex

# define __NR_futex 202

#endif

#ifndef __NR_gettid

# define __NR_gettid 186

#endif

#endif



#ifdef __powerpc__

tools/perf/util/include/asm/unistd_32.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line