summaryrefslogtreecommitdiffstats
path: root/includes/sys/sdt.h
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2009-08-10 15:17:35 -0700
committerJosh Stone <jistone@redhat.com>2009-08-10 15:17:35 -0700
commitaeb2727bd6742d8e4ff98882e57078f72da21b68 (patch)
tree1d8e64e172682055a3c0b8068f8dcf93dcc71042 /includes/sys/sdt.h
parent7f17af5c9ace193eef48246bcadf42ae9650de67 (diff)
parenta09930468b2d2bae134067d50a9b15b5ba2af548 (diff)
downloadsystemtap-steved-aeb2727bd6742d8e4ff98882e57078f72da21b68.tar.gz
systemtap-steved-aeb2727bd6742d8e4ff98882e57078f72da21b68.tar.xz
systemtap-steved-aeb2727bd6742d8e4ff98882e57078f72da21b68.zip
Merge branch 'master' of ssh://sourceware.org/git/systemtap
Diffstat (limited to 'includes/sys/sdt.h')
-rw-r--r--includes/sys/sdt.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
index f179c2a7..e3a605c5 100644
--- a/includes/sys/sdt.h
+++ b/includes/sys/sdt.h
@@ -68,7 +68,7 @@
#define STAP_UNINLINE_LABEL(label) \
__extension__ static volatile long labelval __attribute__ ((unused)) = (long) &&label
-#if defined __x86_64__ || defined __i386__ || defined __powerpc__
+#if defined __x86_64__ || defined __i386__ || defined __powerpc__ || defined __arm__
#define STAP_NOP "\tnop "
#else
#define STAP_NOP "\tnop 0 "