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

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

perf tools: Introduce weak alternative to sched_getcpu() 

Which is just a wrapper for sys_getcpu and is not present in at least
musl libc.

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-kblef7svmhr0g93kkx78envg@git.kernel.org


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

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

+3 −0
Original line number Diff line number Diff line
@@ -7,3 +7,6 @@ 
#ifndef __NR_gettid

# define __NR_gettid 224

#endif

#ifndef __NR_getcpu

# define __NR_getcpu 318

#endif

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

+3 −0
Original line number Diff line number Diff line
@@ -7,3 +7,6 @@ 
#ifndef __NR_gettid

# define __NR_gettid 186

#endif

#ifndef __NR_getcpu

# define __NR_getcpu 309

#endif

tools/perf/util/cloexec.c

+10 −4
Original line number Diff line number Diff line
@@ -4,18 +4,24 @@ 
#include "cloexec.h"

#include "asm/bug.h"

#include "debug.h"

#include <unistd.h>

#include <asm/unistd.h>

#include <sys/syscall.h>



static unsigned long flag = PERF_FLAG_FD_CLOEXEC;



#ifdef __GLIBC_PREREQ

#if !__GLIBC_PREREQ(2, 6)

int __weak sched_getcpu(void)

{

#ifdef __NR_getcpu

	unsigned cpu;

	int err = syscall(__NR_getcpu, &cpu, NULL, NULL);

	if (!err)

		return cpu;

#else

	errno = ENOSYS;

#endif

	return -1;

}

#endif

#endif



static int perf_flag_probe(void)

{

tools/perf/util/util.h

+4 −0
Original line number Diff line number Diff line
@@ -361,4 +361,8 @@ void print_binary(unsigned char *data, size_t len, 
		  size_t bytes_per_line, print_binary_t printer,

		  void *extra);



#ifndef __GLIBC__

extern int sched_getcpu(void);

#endif



#endif /* GIT_COMPAT_UTIL_H */