lkml.org 
[lkml]   [2018]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 352/366] perf tools: Move syscall number fallbacks from perf-sys.h to tools/arch/x86/include/asm/
    3.16.61-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    commit cec07f53c398f22576df77052c4777dc13f14962 upstream.

    And remove the empty tools/arch/x86/include/asm/unistd_{32,64}.h files
    introduced by eae7a755ee81 ("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: Arnaldo Carvalho de Melo <acme@redhat.com>
    [bwh: Backported to 3.16:
    - Also remove the deleted headers from LIB_H in Makefile.perf
    - Adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    --- /dev/null
    +++ b/tools/arch/x86/include/asm/unistd_32.h
    @@ -0,0 +1,9 @@
    +#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
    --- /dev/null
    +++ b/tools/arch/x86/include/asm/unistd_64.h
    @@ -0,0 +1,9 @@
    +#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
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -252,6 +252,7 @@ CFLAGS += -I$(src-perf)/arch/$(ARCH)/inc
    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

    --- a/tools/perf/perf-sys.h
    +++ b/tools/perf/perf-sys.h
    @@ -14,15 +14,6 @@
    #define rmb() asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
    #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__)
    @@ -31,15 +22,6 @@
    #define rmb() asm volatile("lfence" ::: "memory")
    #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__
    --- a/tools/perf/util/include/asm/unistd_32.h
    +++ /dev/null
    @@ -1 +0,0 @@
    -
    --- a/tools/perf/util/include/asm/unistd_64.h
    +++ /dev/null
    @@ -1 +0,0 @@
    -
    --- a/tools/perf/Makefile.perf
    +++ b/tools/perf/Makefile.perf
    @@ -239,8 +239,6 @@ LIB_H += util/include/asm/uaccess.h
    LIB_H += util/include/dwarf-regs.h
    LIB_H += util/include/asm/dwarf2.h
    LIB_H += util/include/asm/cpufeature.h
    -LIB_H += util/include/asm/unistd_32.h
    -LIB_H += util/include/asm/unistd_64.h
    LIB_H += perf.h
    LIB_H += util/annotate.h
    LIB_H += util/cache.h
    \
     
     \ /
      Last update: 2018-11-11 21:32    [W:2.360 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site