Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-08 14:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf trace beauty flock: Move to separate object file

Browse Source 
To resolve some header conflicts that were preventing the build to
succeed in the Alpine Linux distribution.

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: https://lkml.kernel.org/n/tip-bvud0dvzvip3kibeplupdbmc@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2018-01-22 16:50:16 -03:00
parent bafae98e7a
commit c19d0847b2
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/perf/builtin-trace.c
View File

@ -548,7 +548,6 @@ static size_t syscall_arg__scnprintf_getrandom_flags(char *bf, size_t size,
#include "trace/beauty/arch_errno_names.c" #include "trace/beauty/arch_errno_names.c"
#include "trace/beauty/eventfd.c" #include "trace/beauty/eventfd.c"
#include "trace/beauty/flock.c"
#include "trace/beauty/futex_op.c" #include "trace/beauty/futex_op.c"
#include "trace/beauty/futex_val3.c" #include "trace/beauty/futex_val3.c"
#include "trace/beauty/mmap.c" #include "trace/beauty/mmap.c"

1
tools/perf/trace/beauty/Build
View File

@ -1,5 +1,6 @@
libperf-y += clone.o libperf-y += clone.o
libperf-y += fcntl.o libperf-y += fcntl.o
libperf-y += flock.o
ifeq ($(SRCARCH),$(filter $(SRCARCH),x86)) ifeq ($(SRCARCH),$(filter $(SRCARCH),x86))
libperf-y += ioctl.o libperf-y += ioctl.o
endif endif

3
tools/perf/trace/beauty/beauty.h
View File

@ -79,6 +79,9 @@ size_t syscall_arg__scnprintf_fcntl_cmd(char *bf, size_t size, struct syscall_ar
size_t syscall_arg__scnprintf_fcntl_arg(char *bf, size_t size, struct syscall_arg *arg); size_t syscall_arg__scnprintf_fcntl_arg(char *bf, size_t size, struct syscall_arg *arg);
#define SCA_FCNTL_ARG syscall_arg__scnprintf_fcntl_arg #define SCA_FCNTL_ARG syscall_arg__scnprintf_fcntl_arg
size_t syscall_arg__scnprintf_flock(char *bf, size_t size, struct syscall_arg *arg);
#define SCA_FLOCK syscall_arg__scnprintf_flock
size_t syscall_arg__scnprintf_ioctl_cmd(char *bf, size_t size, struct syscall_arg *arg); size_t syscall_arg__scnprintf_ioctl_cmd(char *bf, size_t size, struct syscall_arg *arg);
#define SCA_IOCTL_CMD syscall_arg__scnprintf_ioctl_cmd #define SCA_IOCTL_CMD syscall_arg__scnprintf_ioctl_cmd

10
tools/perf/trace/beauty/flock.c
View File

@ -1,5 +1,8 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <fcntl.h>
#include "trace/beauty/beauty.h"
#include <linux/kernel.h>
#include <uapi/linux/fcntl.h>
#ifndef LOCK_MAND #ifndef LOCK_MAND
#define LOCK_MAND 32 #define LOCK_MAND 32
@ -17,8 +20,7 @@
#define LOCK_RW 192 #define LOCK_RW 192
#endif #endif
static size_t syscall_arg__scnprintf_flock(char *bf, size_t size, size_t syscall_arg__scnprintf_flock(char *bf, size_t size, struct syscall_arg *arg)
struct syscall_arg *arg)
{ {
int printed = 0, op = arg->val; int printed = 0, op = arg->val;
@ -45,5 +47,3 @@ static size_t syscall_arg__scnprintf_flock(char *bf, size_t size,
return printed; return printed;
} }
#define SCA_FLOCK syscall_arg__scnprintf_flock