summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-6.1/212-tools_portability.patch
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2022-10-18 23:43:43 +0200
committerChristian Marangi <ansuelsmth@gmail.com>2023-05-22 22:28:15 +0200
commit19a246bb6503942fe332c1f744d583e38aeca9c0 (patch)
treeffd9ab410b7a131750086be4aaa843466ee117ac /target/linux/generic/hack-6.1/212-tools_portability.patch
parent92a0cc7c61d0d532449ccda0fbf2dc622ece17c5 (diff)
downloadopenwrt-19a246bb6503942fe332c1f744d583e38aeca9c0.tar.gz
openwrt-19a246bb6503942fe332c1f744d583e38aeca9c0.tar.bz2
openwrt-19a246bb6503942fe332c1f744d583e38aeca9c0.zip
generic: 6.1: manually refresh hack patches
Refresh hack patches for kernel 6.1. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/hack-6.1/212-tools_portability.patch')
-rw-r--r--target/linux/generic/hack-6.1/212-tools_portability.patch56
1 files changed, 33 insertions, 23 deletions
diff --git a/target/linux/generic/hack-6.1/212-tools_portability.patch b/target/linux/generic/hack-6.1/212-tools_portability.patch
index b488155f94..0b908f7c7d 100644
--- a/target/linux/generic/hack-6.1/212-tools_portability.patch
+++ b/target/linux/generic/hack-6.1/212-tools_portability.patch
@@ -81,30 +81,40 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct page;
struct kmem_cache;
---- a/tools/perf/pmu-events/jevents.c
-+++ b/tools/perf/pmu-events/jevents.c
-@@ -1,4 +1,6 @@
-+#ifdef __linux__
- #define _XOPEN_SOURCE 500 /* needed for nftw() */
-+#endif
- #define _GNU_SOURCE /* needed for asprintf() */
-
- /* Parse event JSON files */
-@@ -35,6 +37,7 @@
- #include <stdlib.h>
- #include <errno.h>
+--- a/tools/perf/pmu-events/jevents.py
++++ b/tools/perf/pmu-events/jevents.py
+@@ -684,6 +684,7 @@
+ #include "util/header.h"
+ #include "util/pmu.h"
#include <string.h>
+#include <strings.h>
- #include <ctype.h>
- #include <unistd.h>
- #include <stdarg.h>
---- a/tools/perf/pmu-events/json.c
-+++ b/tools/perf/pmu-events/json.c
-@@ -38,7 +38,6 @@
- #include <unistd.h>
- #include "jsmn.h"
- #include "json.h"
--#include <linux/kernel.h>
+ #include <stddef.h>
+
+ struct compact_pmu_event {
+# --- a/tools/perf/pmu-events/jevents.c
+# +++ b/tools/perf/pmu-events/jevents.c
+# @@ -1,4 +1,6 @@
+# +#ifdef __linux__
+# #define _XOPEN_SOURCE 500 /* needed for nftw() */
+# +#endif
+# #define _GNU_SOURCE /* needed for asprintf() */
+
+# /* Parse event JSON files */
+# @@ -35,6 +37,7 @@
+# #include <stdlib.h>
+# #include <errno.h>
+# #include <string.h>
+# +#include <strings.h>
+# #include <ctype.h>
+# #include <unistd.h>
+# #include <stdarg.h>
+# --- a/tools/perf/pmu-events/json.c
+# +++ b/tools/perf/pmu-events/json.c
+# @@ -38,7 +38,6 @@
+# #include <unistd.h>
+# #include "jsmn.h"
+# #include "json.h"
+# -#include <linux/kernel.h>
- static char *mapfile(const char *fn, size_t *size)
+# static char *mapfile(const char *fn, size_t *size)