diff options
| author | Tim Moore <timoore@redhat.com> | 2010-01-05 15:22:21 +0100 |
|---|---|---|
| committer | Tim Moore <timoore@redhat.com> | 2010-01-05 15:22:21 +0100 |
| commit | 091df18ca8cd329bec8219ce0908a109e25ba1a4 (patch) | |
| tree | 47fcc31c40af1444d277a3baf9de2a5ebe7705aa /includes/sys/sdt.h | |
| parent | 21e8e579ef10942bf2db3e1514026a6d132b1502 (diff) | |
| parent | 23312a05753e948f7053beccc3dedfbe407a660a (diff) | |
| download | systemtap-steved-091df18ca8cd329bec8219ce0908a109e25ba1a4.tar.gz systemtap-steved-091df18ca8cd329bec8219ce0908a109e25ba1a4.tar.xz systemtap-steved-091df18ca8cd329bec8219ce0908a109e25ba1a4.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'includes/sys/sdt.h')
| -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> |