59 строки
1.8 KiB
Diff
59 строки
1.8 KiB
Diff
From 0d356ab48ca68151bc5607737ec87a80c605c335 Mon Sep 17 00:00:00 2001
|
|
From: Mitch Zhu <zhumc11@gmail.com>
|
|
Date: Wed, 3 Apr 2024 10:42:21 -0700
|
|
Subject: [PATCH] Fix python 3.12 build errors
|
|
|
|
---
|
|
tools/perf/tests/bpf.c | 3 ++-
|
|
tools/perf/util/scripting-engines/trace-event-python.c | 2 ++
|
|
tools/scripts/Makefile.include | 2 +-
|
|
3 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
|
|
index fa03ff0dc..4486de74e 100644
|
|
--- a/tools/perf/tests/bpf.c
|
|
+++ b/tools/perf/tests/bpf.c
|
|
@@ -29,11 +29,12 @@
|
|
|
|
static int epoll_pwait_loop(void)
|
|
{
|
|
+ struct epoll_event events;
|
|
int i;
|
|
|
|
/* Should fail NR_ITERS times */
|
|
for (i = 0; i < NR_ITERS; i++)
|
|
- epoll_pwait(-(i + 1), NULL, 0, 0, NULL);
|
|
+ epoll_pwait(-(i + 1), &events, 0, 0, NULL);
|
|
return 0;
|
|
}
|
|
|
|
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
|
|
index c0c010350..28d36bd53 100644
|
|
--- a/tools/perf/util/scripting-engines/trace-event-python.c
|
|
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
|
|
@@ -52,6 +52,8 @@
|
|
#include "stat.h"
|
|
#include "mem-events.h"
|
|
|
|
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
|
+
|
|
#if PY_MAJOR_VERSION < 3
|
|
#define _PyUnicode_FromString(arg) \
|
|
PyString_FromString(arg)
|
|
diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include
|
|
index 071312f5e..eaaa328eb 100644
|
|
--- a/tools/scripts/Makefile.include
|
|
+++ b/tools/scripts/Makefile.include
|
|
@@ -21,7 +21,7 @@ endif
|
|
# Include saner warnings here, which can catch bugs:
|
|
#
|
|
EXTRA_WARNINGS := -Wbad-function-cast
|
|
-EXTRA_WARNINGS += -Wdeclaration-after-statement
|
|
+#EXTRA_WARNINGS += -Wdeclaration-after-statement
|
|
EXTRA_WARNINGS += -Wformat-security
|
|
EXTRA_WARNINGS += -Wformat-y2k
|
|
EXTRA_WARNINGS += -Winit-self
|
|
--
|
|
2.34.1
|
|
|