Version 2.5.7

[lttng-ust.git] / libringbuffer / getcpu.h

diff --git a/libringbuffer/getcpu.h b/libringbuffer/getcpu.h
index 3474bfe0c04f9f218eac190b001b08600f9d8272..190eae6c3d39bf131815e57b05c079c772ff103f 100644 (file)
--- a/libringbuffer/getcpu.h
+++ b/libringbuffer/getcpu.h
@@ -21,7 +21,7 @@
 
 #include <urcu/compiler.h>
 
-#ifdef UST_VALGRIND
+#ifdef LTTNG_UST_DEBUG_VALGRIND
 
 /*
  * Fallback on cpu 0 if liblttng-ust is build with Valgrind support.
@@ -41,7 +41,10 @@ int lttng_ust_get_cpu(void)
  */
 #ifdef __linux__
 
-#ifdef __UCLIBC__
+/* old uClibc versions didn't have sched_getcpu */
+#if defined(__UCLIBC__) && __UCLIBC_MAJOR__ == 0 && \
+       (__UCLIBC_MINOR__ < 9 || \
+        (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32))
 #include <sys/syscall.h>
 #define __getcpu(cpu, node, cache)     syscall(__NR_getcpu, cpu, node, cache)
 /*
@@ -75,11 +78,11 @@ int lttng_ust_get_cpu(void)
 }
 #endif /* __UCLIBC__ */
 
-#elif defined(__FreeBSD__)
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
 
 /*
- * FreeBSD does not allow query of CPU ID. Always use CPU number 0, with
- * the assocated performance degradation on SMP.
+ * FreeBSD and Cygwin do not allow query of CPU ID. Always use CPU
+ * number 0, with the assocated performance degradation on SMP.
  */
 static inline
 int lttng_ust_get_cpu(void)