From 398a7882b05bded7f1d1116d4c06fe25aa7f5fea Mon Sep 17 00:00:00 2001
From: Stan Cox <scox@redhat.com>
Date: Tue, 27 Jan 2009 17:39:44 +0100
Subject: sdt.h (struct _probe_): Make probe_name a STAP_PROBE_STRUCT_ARG.

---
 runtime/sdt.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime/sdt.h')

diff --git a/runtime/sdt.h b/runtime/sdt.h
index 88183461..2db2e3a0 100644
--- a/runtime/sdt.h
+++ b/runtime/sdt.h
@@ -22,13 +22,13 @@
 struct _probe_ ## probe				\
 {						\
   int probe_type;				\
-  char *probe_name;				\
+  STAP_PROBE_STRUCT_ARG	(probe_name);		\
   STAP_PROBE_STRUCT_ARG	(probe_arg);		\
 };						\
-static char probe_name [strlen(#probe)+1] 	\
+static char probe ## _ ## probe_name [strlen(#probe)+1] 	\
        __attribute__ ((section (".probes"))) 	\
        = #probe; 				\
-static volatile struct _probe_ ## probe _probe_ ## probe __attribute__ ((section (".probes"))) = {STAP_SENTINEL,&probe_name[0],argc};
+ static volatile struct _probe_ ## probe _probe_ ## probe __attribute__ ((section (".probes"))) = {STAP_SENTINEL,(long)& probe ## _ ## probe_name[0],argc};
 
 #define STAP_CONCAT(a,b) a ## b
 #define STAP_LABEL(p,n) \
-- 
cgit