From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 2 May 2018 20:59:16 +0000 (-0700)
Subject: 3.18-stable patches
X-Git-Tag: v4.9.99~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03605661024f73d881e438ca76eae1b5be337991;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	perf-session-fix-undeclared-oe.patch
---

diff --git a/queue-3.18/perf-session-fix-undeclared-oe.patch b/queue-3.18/perf-session-fix-undeclared-oe.patch
new file mode 100644
index 00000000000..138846c9c5e
--- /dev/null
+++ b/queue-3.18/perf-session-fix-undeclared-oe.patch
@@ -0,0 +1,64 @@
+From muriloo@linux.ibm.com  Wed May  2 13:50:29 2018
+From: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
+Date: Wed,  2 May 2018 15:50:44 -0300
+Subject: perf session: Fix undeclared 'oe'
+To: muriloo@linux.ibm.com
+Cc: stable@vger.kernel.org, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Andi Kleen <ak@linux.intel.com>, Arnaldo Carvalho de Melo <acme@redhat.com>, David Carrillo-Cisneros <davidcc@google.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, He Kuang <hekuang@huawei.com>, Ingo Molnar <mingo@redhat.com>, Jiri Olsa <jolsa@kernel.org>, Masami Hiramatsu <mhiramat@kernel.org>, Paul Mackerras <paulus@samba.org>, Paul Turner <pjt@google.com>, Peter Zijlstra <peterz@infradead.org>, Sasha Levin <alexander.levin@microsoft.com>, Simon Que <sque@chromium.org>, Stephane Eranian <eranian@google.com>, Wang Nan <wangnan0@huawei.com>
+Message-ID: <20180502185044.23646-1-muriloo@linux.ibm.com>
+
+From: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
+
+Using linux-3.18.y branch, perf build fails with the following:
+
+    $ make -s -j16 -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=/usr DESTDIR=/tmp/builddir/build all
+    [...]
+    util/session.c: In function ‘__perf_session__process_pipe_events’:
+    util/session.c:1093:36: error: ‘oe’ undeclared (first use in this function)
+      ordered_events__set_copy_on_queue(oe, true);
+                                        ^
+    util/session.c:1093:36: note: each undeclared identifier is reported only once for each function it appears in
+
+This patch fixes it for linux-3.18.y branch.
+
+Fixes: 95b33b99cdd6 ("perf inject: Copy events when reordering events in pipe mode")
+Cc: <stable@vger.kernel.org> # 3.18.x
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Andi Kleen <ak@linux.intel.com>
+Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: David Carrillo-Cisneros <davidcc@google.com>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: He Kuang <hekuang@huawei.com>
+Cc: Ingo Molnar <mingo@redhat.com>
+Cc: Jiri Olsa <jolsa@kernel.org>
+Cc: Masami Hiramatsu <mhiramat@kernel.org>
+Cc: Paul Mackerras <paulus@samba.org>
+Cc: Paul Turner <pjt@google.com>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Cc: Simon Que <sque@chromium.org>
+Cc: Stephane Eranian <eranian@google.com>
+Cc: Wang Nan <wangnan0@huawei.com>
+Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+Hi, Greg.
+
+Perf build on linux-3.18.y is broken since v3.18.101 (v3.18.100 worked just
+fine). This fixes it.
+
+Changes since v2:
+ - rebased on v3.18.108
+
+ tools/perf/util/session.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/tools/perf/util/session.c
++++ b/tools/perf/util/session.c
+@@ -1073,6 +1073,7 @@ volatile int session_done;
+ static int __perf_session__process_pipe_events(struct perf_session *session,
+ 					       struct perf_tool *tool)
+ {
++	struct ordered_events *oe = &session->ordered_events;
+ 	int fd = perf_data_file__fd(session->file);
+ 	union perf_event *event;
+ 	uint32_t size, cur_size = 0;
diff --git a/queue-3.18/series b/queue-3.18/series
index 9326b1a4f36..e9234df5816 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -185,3 +185,4 @@ scsi-lpfc-fix-frequency-of-release-wqe-cqes.patch
 regulator-of-add-a-missing-of_node_put-in-an-error-handling-path-of-of_regulator_match.patch
 asoc-samsung-i2s-ensure-the-rclk-rate-is-properly-determined.patch
 kdb-make-mdr-command-repeat.patch
+perf-session-fix-undeclared-oe.patch