Skip to content

Commit 619ffe6

Browse files
charlie-rivosacmel
authored andcommitted
perf tools mips: Use generic syscall scripts
Use the generic scripts to generate headers from the syscall table for mips. Signed-off-by: Charlie Jenkins <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Christian Brauner <[email protected]> Cc: Guo Ren <[email protected]> Cc: Günther Noack <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: James Clark <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: John Garry <[email protected]> Cc: Jonathan Corbet <[email protected]> Cc: Leo Yan <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Mickaël Salaün <[email protected]> Cc: Mike Leach <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Palmer Dabbelt <[email protected]> Cc: Paul Walmsley <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Will Deacon <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent fa70857 commit 619ffe6

File tree

7 files changed

+11
-39
lines changed

7 files changed

+11
-39
lines changed

tools/perf/Makefile.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $(call detected_var,SRCARCH)
3131
ifneq ($(NO_SYSCALL_TABLE),1)
3232
NO_SYSCALL_TABLE := 1
3333

34-
ifeq ($(SRCARCH),$(filter $(SRCARCH),powerpc s390 mips))
34+
ifeq ($(SRCARCH),$(filter $(SRCARCH),powerpc s390))
3535
NO_SYSCALL_TABLE := 0
3636
endif
3737

@@ -95,7 +95,6 @@ ifeq ($(ARCH),s390)
9595
endif
9696

9797
ifeq ($(ARCH),mips)
98-
CFLAGS += -I$(OUTPUT)arch/mips/include/generated
9998
ifndef NO_LIBUNWIND
10099
LIBUNWIND_LIBS = -lunwind -lunwind-mips
101100
endif

tools/perf/Makefile.perf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ FEATURE_TESTS := all
311311
endif
312312
endif
313313
# architectures that use the generic syscall table
314-
generic_syscall_table_archs := riscv arc csky arm sh sparc xtensa x86 alpha parisc arm64 loongarch
314+
generic_syscall_table_archs := riscv arc csky arm sh sparc xtensa x86 alpha parisc arm64 loongarch mips
315315
ifneq ($(filter $(SRCARCH), $(generic_syscall_table_archs)),)
316316
include $(srctree)/tools/perf/scripts/Makefile.syscalls
317317
endif
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
syscall-y += syscalls_64.h
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
3+
syscall_abis_64 += n64
4+
5+
syscalltbl = $(srctree)/tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl

tools/perf/arch/mips/entry/syscalls/mksyscalltbl

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
#include <asm/syscalls_64.h>

tools/perf/util/syscalltbl.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ static const char *const *syscalltbl_native = syscalltbl_powerpc_64;
2626
#include <asm/syscalls_32.c>
2727
const int syscalltbl_native_max_id = SYSCALLTBL_POWERPC_32_MAX_ID;
2828
static const char *const *syscalltbl_native = syscalltbl_powerpc_32;
29-
#elif defined(__mips__)
30-
#include <asm/syscalls_n64.c>
31-
const int syscalltbl_native_max_id = SYSCALLTBL_MIPS_N64_MAX_ID;
32-
static const char *const *syscalltbl_native = syscalltbl_mips_n64;
3329
#elif defined(GENERIC_SYSCALL_TABLE)
3430
#include <syscall_table.h>
3531
const int syscalltbl_native_max_id = SYSCALLTBL_MAX_ID;

0 commit comments

Comments
 (0)