summaryrefslogtreecommitdiffstats
path: root/includes/sys
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-04-23 14:16:36 -0400
committerDave Brolley <brolley@redhat.com>2009-04-23 14:16:36 -0400
commitfb6d28283bd7ea63364a008d32c53687a694642f (patch)
treeaa2d8faf381be8ba016cf4fb18a4d01da464ac60 /includes/sys
parente8aa2f848123598fa8c2110804b250cba1286271 (diff)
parent819ec23db74427d0249596959c938673f424f831 (diff)
downloadsystemtap-steved-fb6d28283bd7ea63364a008d32c53687a694642f.tar.gz
systemtap-steved-fb6d28283bd7ea63364a008d32c53687a694642f.tar.xz
systemtap-steved-fb6d28283bd7ea63364a008d32c53687a694642f.zip
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts: Makefile.in
Diffstat (limited to 'includes/sys')
-rw-r--r--includes/sys/sdt.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
index e5265ff1..c2242303 100644
--- a/includes/sys/sdt.h
+++ b/includes/sys/sdt.h
@@ -13,6 +13,12 @@
#include <string.h>
#include <sys/types.h>
+#ifdef __LP64__
+#define STAP_PROBE_ADDR "\t.quad "
+#else
+#define STAP_PROBE_ADDR "\t.long "
+#endif
+
#define STAP_PROBE_DATA_(probe) \
__asm__ volatile (".section .probes\n" \
"\t.align 8\n" \
@@ -20,9 +26,9 @@
"\t.align 4\n" \
"\t.int 0x31425250\n" \
"\t.align 8\n" \
- "\t.quad 1b\n" \
+ STAP_PROBE_ADDR "1b\n" \
"\t.align 8\n" \
- "\t.quad 2f\n" \
+ STAP_PROBE_ADDR "2f\n" \
"\t.previous\n")
#define STAP_PROBE_DATA(probe) \