drop perf patch from trees as it broke the build

diff --git a/queue-4.14/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch b/queue-4.14/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch
deleted file mode 100644 (file)
index 59ee889..0000000
--- a/queue-4.14/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 3e909c01c55e02867711e6489e3c4faac852e795 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 7 Aug 2019 10:44:17 -0400
-Subject: perf ftrace: Use CAP_SYS_ADMIN instead of euid==0
-
-From: Igor Lubashev <ilubashe@akamai.com>
-
-[ Upstream commit c766f3df635de14295e410c6dd5410bc416c24a0 ]
-
-The kernel requires CAP_SYS_ADMIN instead of euid==0 to mount debugfs
-for ftrace.  Make perf do the same.
-
-Signed-off-by: Igor Lubashev <ilubashe@akamai.com>
-Acked-by: Jiri Olsa <jolsa@kernel.org>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
-Cc: James Morris <jmorris@namei.org>
-Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
-Cc: linux-arm-kernel@lists.infradead.org
-Link: http://lkml.kernel.org/r/bd8763b72ed4d58d0b42d44fbc7eb474d32e53a3.1565188228.git.ilubashe@akamai.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/builtin-ftrace.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
-index 13a33fb71a6da..6f07c5541fdea 100644
---- a/tools/perf/builtin-ftrace.c
-+++ b/tools/perf/builtin-ftrace.c
-@@ -14,6 +14,7 @@
- #include <signal.h>
- #include <fcntl.h>
- #include <poll.h>
-+#include <linux/capability.h>
- 
- #include "debug.h"
- #include <subcmd/parse-options.h>
-@@ -22,6 +23,7 @@
- #include "target.h"
- #include "cpumap.h"
- #include "thread_map.h"
-+#include "util/cap.h"
- #include "util/config.h"
- 
- 
-@@ -270,7 +272,7 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv)
-               .events = POLLIN,
-       };
- 
--      if (geteuid() != 0) {
-+      if (!perf_cap__capable(CAP_SYS_ADMIN)) {
-               pr_err("ftrace only works for root!\n");
-               return -1;
-       }
--- 
-2.20.1
-

diff --git a/queue-4.19/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch b/queue-4.19/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch
deleted file mode 100644 (file)
index 4f371c4..0000000
--- a/queue-4.19/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From ef375daf32294fbfdf25702b3e090eb63967edc0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 7 Aug 2019 10:44:17 -0400
-Subject: perf ftrace: Use CAP_SYS_ADMIN instead of euid==0
-
-From: Igor Lubashev <ilubashe@akamai.com>
-
-[ Upstream commit c766f3df635de14295e410c6dd5410bc416c24a0 ]
-
-The kernel requires CAP_SYS_ADMIN instead of euid==0 to mount debugfs
-for ftrace.  Make perf do the same.
-
-Signed-off-by: Igor Lubashev <ilubashe@akamai.com>
-Acked-by: Jiri Olsa <jolsa@kernel.org>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
-Cc: James Morris <jmorris@namei.org>
-Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
-Cc: linux-arm-kernel@lists.infradead.org
-Link: http://lkml.kernel.org/r/bd8763b72ed4d58d0b42d44fbc7eb474d32e53a3.1565188228.git.ilubashe@akamai.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/builtin-ftrace.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
-index 137955197ba8d..e0c61c572db06 100644
---- a/tools/perf/builtin-ftrace.c
-+++ b/tools/perf/builtin-ftrace.c
-@@ -14,6 +14,7 @@
- #include <signal.h>
- #include <fcntl.h>
- #include <poll.h>
-+#include <linux/capability.h>
- 
- #include "debug.h"
- #include <subcmd/parse-options.h>
-@@ -22,6 +23,7 @@
- #include "target.h"
- #include "cpumap.h"
- #include "thread_map.h"
-+#include "util/cap.h"
- #include "util/config.h"
- 
- 
-@@ -282,7 +284,7 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv)
-               .events = POLLIN,
-       };
- 
--      if (geteuid() != 0) {
-+      if (!perf_cap__capable(CAP_SYS_ADMIN)) {
-               pr_err("ftrace only works for root!\n");
-               return -1;
-       }
--- 
-2.20.1
-

diff --git a/queue-5.2/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch b/queue-5.2/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch
deleted file mode 100644 (file)
index 17ba354..0000000
--- a/queue-5.2/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c2c87517b2dbedb5c9fd5a9c4ac33fab00e10193 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 7 Aug 2019 10:44:17 -0400
-Subject: perf ftrace: Use CAP_SYS_ADMIN instead of euid==0
-
-From: Igor Lubashev <ilubashe@akamai.com>
-
-[ Upstream commit c766f3df635de14295e410c6dd5410bc416c24a0 ]
-
-The kernel requires CAP_SYS_ADMIN instead of euid==0 to mount debugfs
-for ftrace.  Make perf do the same.
-
-Signed-off-by: Igor Lubashev <ilubashe@akamai.com>
-Acked-by: Jiri Olsa <jolsa@kernel.org>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
-Cc: James Morris <jmorris@namei.org>
-Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
-Cc: linux-arm-kernel@lists.infradead.org
-Link: http://lkml.kernel.org/r/bd8763b72ed4d58d0b42d44fbc7eb474d32e53a3.1565188228.git.ilubashe@akamai.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/builtin-ftrace.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
-index 22386ab350504..2026364a61dc2 100644
---- a/tools/perf/builtin-ftrace.c
-+++ b/tools/perf/builtin-ftrace.c
-@@ -13,6 +13,7 @@
- #include <signal.h>
- #include <fcntl.h>
- #include <poll.h>
-+#include <linux/capability.h>
- 
- #include "debug.h"
- #include <subcmd/parse-options.h>
-@@ -21,6 +22,7 @@
- #include "target.h"
- #include "cpumap.h"
- #include "thread_map.h"
-+#include "util/cap.h"
- #include "util/config.h"
- 
- 
-@@ -281,7 +283,7 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv)
-               .events = POLLIN,
-       };
- 
--      if (geteuid() != 0) {
-+      if (!perf_cap__capable(CAP_SYS_ADMIN)) {
-               pr_err("ftrace only works for root!\n");
-               return -1;
-       }
--- 
-2.20.1
-

diff --git a/queue-5.3/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch b/queue-5.3/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch
deleted file mode 100644 (file)
index de8aca4..0000000
--- a/queue-5.3/perf-ftrace-use-cap_sys_admin-instead-of-euid-0.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 54a277c389061fc501624f51a13426d7b797f5f7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 7 Aug 2019 10:44:17 -0400
-Subject: perf ftrace: Use CAP_SYS_ADMIN instead of euid==0
-
-From: Igor Lubashev <ilubashe@akamai.com>
-
-[ Upstream commit c766f3df635de14295e410c6dd5410bc416c24a0 ]
-
-The kernel requires CAP_SYS_ADMIN instead of euid==0 to mount debugfs
-for ftrace.  Make perf do the same.
-
-Signed-off-by: Igor Lubashev <ilubashe@akamai.com>
-Acked-by: Jiri Olsa <jolsa@kernel.org>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
-Cc: James Morris <jmorris@namei.org>
-Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
-Cc: linux-arm-kernel@lists.infradead.org
-Link: http://lkml.kernel.org/r/bd8763b72ed4d58d0b42d44fbc7eb474d32e53a3.1565188228.git.ilubashe@akamai.com
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/builtin-ftrace.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
-index 0193128104056..10971255fd2dc 100644
---- a/tools/perf/builtin-ftrace.c
-+++ b/tools/perf/builtin-ftrace.c
-@@ -13,6 +13,7 @@
- #include <signal.h>
- #include <fcntl.h>
- #include <poll.h>
-+#include <linux/capability.h>
- 
- #include "debug.h"
- #include <subcmd/parse-options.h>
-@@ -21,6 +22,7 @@
- #include "target.h"
- #include "cpumap.h"
- #include "thread_map.h"
-+#include "util/cap.h"
- #include "util/config.h"
- 
- 
-@@ -281,7 +283,7 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv)
-               .events = POLLIN,
-       };
- 
--      if (geteuid() != 0) {
-+      if (!perf_cap__capable(CAP_SYS_ADMIN)) {
-               pr_err("ftrace only works for root!\n");
-               return -1;
-       }
--- 
-2.20.1
-