* PR11599: update STAPCONF_TRACEPOINT_HAS_DATA to work with kernel 5.7.0+
@ 2020-05-24 14:07 Torsten Polle
2020-05-25 13:39 ` Serhei Makarov
0 siblings, 1 reply; 2+ messages in thread
From: Torsten Polle @ 2020-05-24 14:07 UTC (permalink / raw)
To: smakarov; +Cc: systemtap
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
Hi Serhei,
Your patch introduces a new source for the definition of STAPCONF_TRACEPOINT_HAS_DATA in the files generated by autoconf, which conflicts with the original definition stp_tracepoints.h.
The following patch remedies this situation at least in my environment. But I wonder whether the definition in stp_tracepoints.h could be simply removed.
Kind Regards,
Torsten
[-- Attachment #2: PR11599-Fix-STAPCONF_TRACEPOINT_HAS_DATA-already-def.patch --]
[-- Type: application/octet-stream, Size: 854 bytes --]
From ec0017bf86606f87703a2b8345f49dc0eebf363c Mon Sep 17 00:00:00 2001
From: Torsten Polle <Torsten.Polle@gmx.de>
Date: Sun, 24 May 2020 10:49:35 +0200
Subject: [PATCH] PR11599: Fix: STAPCONF_TRACEPOINT_HAS_DATA already defined.
---
runtime/linux/stp_tracepoint.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/runtime/linux/stp_tracepoint.h b/runtime/linux/stp_tracepoint.h
index cb8d335..e66cd4f 100644
--- a/runtime/linux/stp_tracepoint.h
+++ b/runtime/linux/stp_tracepoint.h
@@ -21,7 +21,9 @@
* Since NOARGS was removed in 5.7.0, this configuration is now also
* checked with autoconf-tracepoint-has-data.c. */
#ifdef DECLARE_TRACE_NOARGS
-#define STAPCONF_TRACEPOINT_HAS_DATA
+# ifndef STAPCONF_TRACEPOINT_HAS_DATA
+# define STAPCONF_TRACEPOINT_HAS_DATA
+# endif
#endif
--
2.7.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: PR11599: update STAPCONF_TRACEPOINT_HAS_DATA to work with kernel 5.7.0+
2020-05-24 14:07 PR11599: update STAPCONF_TRACEPOINT_HAS_DATA to work with kernel 5.7.0+ Torsten Polle
@ 2020-05-25 13:39 ` Serhei Makarov
0 siblings, 0 replies; 2+ messages in thread
From: Serhei Makarov @ 2020-05-25 13:39 UTC (permalink / raw)
To: Torsten Polle, Serhei Makarov; +Cc: systemtap
Hello Torsten,
Thank you very much for testing the change! I went to apply your patch this morning and saw that Frank also caught the same problem and fixed it with commit 823a77ab03c3. If that approach to fix it still generates a warning, I'll apply your patch.
In answer to your question, to remove the definition of stp_tracepoints.h, the autoconf file must compile correctly on every prior kernel version where DECLARE_TRACE_NOARGS was defined.
I have not verified this, so I can only be certain the autoconf check is appropriate for kernel 5.7+.
For earlier versions, we continue to check for DECLARE_TRACE_NOARGS.
All the best,
Serhei
On Sun, May 24, 2020, at 10:07 AM, Torsten Polle wrote:
> Hi Serhei,
>
> Your patch introduces a new source for the definition of
> STAPCONF_TRACEPOINT_HAS_DATA in the files generated by autoconf, which
> conflicts with the original definition stp_tracepoints.h.
>
> The following patch remedies this situation at least in my environment.
> But I wonder whether the definition in stp_tracepoints.h could be
> simply removed.
>
> Kind Regards,
> Torsten
>
> Attachments:
> * PR11599-Fix-STAPCONF_TRACEPOINT_HAS_DATA-already-def.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-25 13:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-24 14:07 PR11599: update STAPCONF_TRACEPOINT_HAS_DATA to work with kernel 5.7.0+ Torsten Polle
2020-05-25 13:39 ` Serhei Makarov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).