X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-tracepoint-event.h;h=0a9270c57d11c530ce705a436cc01ccebc6baab8;hb=800ceaa56aa7ee73052dbbdc136146091aed1ece;hp=d9aa6ce6bdb8f8496b7b7a1dc41facf20ca6a169;hpb=13b09b636068bd4395b7cdd4f0be99cbfa95fe2f;p=lttng-ust.git

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index d9aa6ce6..0a9270c5 100644
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -566,11 +566,23 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
 #define _TP_SESSION_CHECK(session, csession)   1
 #endif /* TP_SESSION_CHECK */
 
+/*
+ * Use of __builtin_return_address(0) sometimes seems to cause stack
+ * corruption on 32-bit PowerPC. Disable this feature on that
+ * architecture for now by always using the NULL value for the ip
+ * context.
+ */
 #undef _TP_IP_PARAM
 #ifdef TP_IP_PARAM
 #define _TP_IP_PARAM(x)		(x)
 #else /* TP_IP_PARAM */
+
+#if defined(__PPC__) && !defined(__PPC64__)
+#define _TP_IP_PARAM(x)		NULL
+#else /* #if defined(__PPC__) && !defined(__PPC64__) */
 #define _TP_IP_PARAM(x)		__builtin_return_address(0)
+#endif /* #else #if defined(__PPC__) && !defined(__PPC64__) */
+
 #endif /* TP_IP_PARAM */
 
 /*