From 8b5c229525fd493416a34a7877f96ea2615953d4 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Wed, 9 Jun 2010 12:11:57 -0400 Subject: [PATCH] PR11680: fix sdt.h STAP_SDT_V2 -> V1 auto-downgrading logic Previously, the STAP_SDT_V2 -> V1 downgrade logic was half way down in the header file, by which time some STAP_SDT_V2 definitions had already taken effect. * includes/sys/sdt.h: Make work on PPC et al. --- includes/sys/sdt.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h index 208e7d082..dcd31ae4c 100644 --- a/includes/sys/sdt.h +++ b/includes/sys/sdt.h @@ -10,6 +10,15 @@ #include #include + +/* 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 +#undef STAP_SDT_V2 +#endif + + typedef struct { __extension__ struct @@ -114,12 +123,6 @@ typedef struct #endif -/* 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 - #if defined __x86_64__ || defined __i386__ || defined __powerpc__ || defined __arm__ || defined __sparc__ #define STAP_NOP "\tnop " #else -- 2.43.5