From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 2 Aug 2021 11:48:05 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v4.4.278~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=133b9499695f2ccc50f4f6cc760b1006a59946bf;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	revert-perf-map-fix-dso-nsinfo-refcounting.patch
---

diff --git a/queue-4.14/revert-perf-map-fix-dso-nsinfo-refcounting.patch b/queue-4.14/revert-perf-map-fix-dso-nsinfo-refcounting.patch
new file mode 100644
index 00000000000..5dad6ac5490
--- /dev/null
+++ b/queue-4.14/revert-perf-map-fix-dso-nsinfo-refcounting.patch
@@ -0,0 +1,39 @@
+From 9bac1bd6e6d36459087a728a968e79e37ebcea1a Mon Sep 17 00:00:00 2001
+From: Arnaldo Carvalho de Melo <acme@redhat.com>
+Date: Fri, 30 Jul 2021 18:26:22 -0300
+Subject: Revert "perf map: Fix dso->nsinfo refcounting"
+
+From: Arnaldo Carvalho de Melo <acme@redhat.com>
+
+commit 9bac1bd6e6d36459087a728a968e79e37ebcea1a upstream.
+
+This makes 'perf top' abort in some cases, and the right fix will
+involve surgery that is too much to do at this stage, so revert for now
+and fix it in the next merge window.
+
+This reverts commit 2d6b74baa7147251c30a46c4996e8cc224aa2dc5.
+
+Cc: Riccardo Mancini <rickyman7@gmail.com>
+Cc: Ian Rogers <irogers@google.com>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Krister Johansen <kjlx@templeofstupid.com>
+Cc: Mark Rutland <mark.rutland@arm.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/perf/util/map.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/tools/perf/util/map.c
++++ b/tools/perf/util/map.c
+@@ -216,8 +216,6 @@ struct map *map__new(struct machine *mac
+ 			if (type != MAP__FUNCTION)
+ 				dso__set_loaded(dso, map->type);
+ 		}
+-
+-		nsinfo__put(dso->nsinfo);
+ 		dso->nsinfo = nsi;
+ 		dso__put(dso);
+ 	}
diff --git a/queue-4.14/series b/queue-4.14/series
index d4ce3330725..5454a053ab5 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -35,3 +35,4 @@ sctp-fix-return-value-check-in-__sctp_rcv_asconf_loo.patch
 tulip-windbond-840-fix-missing-pci_disable_device-in.patch
 sis900-fix-missing-pci_disable_device-in-probe-and-r.patch
 can-hi311x-fix-a-signedness-bug-in-hi3110_cmd.patch
+revert-perf-map-fix-dso-nsinfo-refcounting.patch