X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fgetcpu.h;h=44d0d5594f04641029bb70116d6784b8f8ef0ff0;hb=7a673d9947d11a37d08be89a5c157afdfd377f9f;hp=3474bfe0c04f9f218eac190b001b08600f9d8272;hpb=dbafbbf5527d2e291b216216fd2c5b7dc4df66ed;p=lttng-ust.git

diff --git a/libringbuffer/getcpu.h b/libringbuffer/getcpu.h
index 3474bfe0..44d0d559 100644
--- a/libringbuffer/getcpu.h
+++ b/libringbuffer/getcpu.h
@@ -20,8 +20,9 @@
  */
 
 #include <urcu/compiler.h>
+#include <sched.h>
 
-#ifdef UST_VALGRIND
+#ifdef LTTNG_UST_DEBUG_VALGRIND
 
 /*
  * Fallback on cpu 0 if liblttng-ust is build with Valgrind support.
@@ -36,30 +37,6 @@ int lttng_ust_get_cpu(void)
 
 #else
 
-/*
- * sched_getcpu.
- */
-#ifdef __linux__
-
-#ifdef __UCLIBC__
-#include <sys/syscall.h>
-#define __getcpu(cpu, node, cache)	syscall(__NR_getcpu, cpu, node, cache)
-/*
- * If getcpu is not implemented in the kernel, use cpu 0 as fallback.
- */
-static inline
-int lttng_ust_get_cpu(void)
-{
-	int cpu, ret;
-
-	ret = __getcpu(&cpu, NULL, NULL);
-	if (caa_unlikely(ret < 0))
-		return 0;
-	return c;
-}
-#else /* __UCLIBC__ */
-#include <sched.h>
-
 /*
  * If getcpu is not implemented in the kernel, use cpu 0 as fallback.
  */
@@ -73,23 +50,6 @@ int lttng_ust_get_cpu(void)
 		return 0;
 	return cpu;
 }
-#endif	/* __UCLIBC__ */
-
-#elif defined(__FreeBSD__)
-
-/*
- * FreeBSD does 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)
-{
-	return 0;
-}
-
-#else
-#error "Please add support for your OS into liblttng-ust/compat.h."
-#endif
 
 #endif