From: Stan Cox <scox@redhat.com>
Date: Thu, 10 Jun 2010 13:49:05 +0000 (-0400)
Subject: Fix 3-way merge result.
X-Git-Tag: release-1.3~258
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=d0f224e0804cd054d011e4b6dc843a7c4339d719;p=systemtap.git

Fix 3-way merge result.

* sdt.h: Remove extra hunk from merge.
---

diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
index 18c26d8e2..d3b000e37 100644
--- a/includes/sys/sdt.h
+++ b/includes/sys/sdt.h
@@ -54,12 +54,6 @@ typedef struct
    on having a writable .probes section to put the enabled variables in. */
 #define ALLOCSEC "\"aw\""
 
-/* The asm operand string stap_sdt_probe_entry_v2.arg_string
-   is currently only supported for x86 */
-#if ! defined __x86_64__ && ! defined __i386__
-#define STAP_SDT_V1 1
-#endif
-
 #define STAP_SEMAPHORE(provider,probe)
 #ifdef STAP_SDT_IMPLICIT_ENABLED /* allow users to override */
  #if defined STAP_HAS_SEMAPHORES