diff options
| author | Dave Brolley <brolley@redhat.com> | 2010-01-07 14:00:49 -0500 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2010-01-07 14:00:49 -0500 |
| commit | af7b183c32c627b1934e9be2d028d7c4ff1a1d2e (patch) | |
| tree | a1670ad0f02f3ebb47ef2aca648ff7d6afc4e5db /includes | |
| parent | a0626e2e2ea13b6fc974157fb71fe6d48f4c7ec0 (diff) | |
| parent | 4bd4d40e19f7ba203d5e380965210181648f560a (diff) | |
| download | systemtap-steved-af7b183c32c627b1934e9be2d028d7c4ff1a1d2e.tar.gz systemtap-steved-af7b183c32c627b1934e9be2d028d7c4ff1a1d2e.tar.xz systemtap-steved-af7b183c32c627b1934e9be2d028d7c4ff1a1d2e.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/sys/sdt.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h index 7c23d55a..882a0d8b 100644 --- a/includes/sys/sdt.h +++ b/includes/sys/sdt.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2009 Red Hat Inc. +/* Copyright (C) 2005-2010 Red Hat Inc. This file is part of systemtap, and is free software in the public domain. */ @@ -49,7 +49,7 @@ #define STAP_SEMAPHORE(probe) #endif -#if ! (defined EXPERIMENTAL_UTRACE_SDT || defined EXPERIMENTAL_KPROBE_SDT) +#if ! defined EXPERIMENTAL_KPROBE_SDT /* These baroque macros are used to create a unique label. */ #define STAP_CONCAT(a,b) a ## b @@ -222,7 +222,7 @@ do STAP_SEMAPHORE(probe) { \ STAP_NOP "/* %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 */" :: "g"(arg1), "g"(arg2), "g"(arg3), "g"(arg4), "g"(arg5), "g"(arg6), "g"(arg7), "g"(arg8), "g"(arg9), "g"(arg10)); \ } while (0) -#else /* ! (defined EXPERIMENTAL_UTRACE_SDT || defined EXPERIMENTAL_KPROBE_SDT) */ +#else /* ! defined EXPERIMENTAL_KPROBE_SDT */ #include <unistd.h> #include <sys/syscall.h> # if defined (__USE_ANSI) @@ -231,9 +231,6 @@ extern long int syscall (long int __sysno, ...) __THROW; # if defined EXPERIMENTAL_KPROBE_SDT # define STAP_SYSCALL __NR_getegid # define STAP_GUARD 0x32425250 -# elif defined EXPERIMENTAL_UTRACE_SDT -# define STAP_SYSCALL 0xbead -# define STAP_GUARD 0x33425250 # endif #include <sys/syscall.h> |