From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 18 Jul 2018 08:35:06 +0000 (+0200)
Subject: 4.4-stable patches
X-Git-Tag: v4.4.142~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8eac8319f88cf6bcb4a5a896197ba2cf2cacfe2d;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	perf-tools-move-syscall-number-fallbacks-from-perf-sys.h-to-tools-arch-x86-include-asm.patch
---

diff --git a/queue-4.4/perf-tools-move-syscall-number-fallbacks-from-perf-sys.h-to-tools-arch-x86-include-asm.patch b/queue-4.4/perf-tools-move-syscall-number-fallbacks-from-perf-sys.h-to-tools-arch-x86-include-asm.patch
new file mode 100644
index 00000000000..a2bd1760616
--- /dev/null
+++ b/queue-4.4/perf-tools-move-syscall-number-fallbacks-from-perf-sys.h-to-tools-arch-x86-include-asm.patch
@@ -0,0 +1,109 @@
+From cec07f53c398f22576df77052c4777dc13f14962 Mon Sep 17 00:00:00 2001
+From: Arnaldo Carvalho de Melo <acme@redhat.com>
+Date: Thu, 7 Jul 2016 18:28:43 -0300
+Subject: perf tools: Move syscall number fallbacks from perf-sys.h to tools/arch/x86/include/asm/
+
+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>
+Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/arch/x86/include/asm/unistd_32.h  |    9 +++++++++
+ tools/arch/x86/include/asm/unistd_64.h  |    9 +++++++++
+ tools/perf/config/Makefile              |    1 +
+ tools/perf/perf-sys.h                   |   18 ------------------
+ tools/perf/util/include/asm/unistd_32.h |    1 -
+ tools/perf/util/include/asm/unistd_64.h |    1 -
+ 6 files changed, 19 insertions(+), 20 deletions(-)
+
+--- /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
+@@ -200,6 +200,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
+@@ -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__
+--- 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 @@
+-
diff --git a/queue-4.4/series b/queue-4.4/series
index 625c7a6e986..3040ba4d1c0 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1,2 +1,3 @@
 kbuild-fix-escaping-in-.cmd-files-for-future-make.patch
 x86-cpu-probe-cpuid-leaf-6-even-when-cpuid_level-6.patch
+perf-tools-move-syscall-number-fallbacks-from-perf-sys.h-to-tools-arch-x86-include-asm.patch