X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fcommon%2Fapi.h;h=cadbcb89070fbf696962f0aff9d6cfe21ba764e1;hp=35a8037e1f3d7efdcd6398b9406ce36989dfdfde;hb=2388c075d46055bd33ee824c399d72c219b98d90;hpb=af9987a987224147a50d0b4dc0542ef561c73b16

diff --git a/tests/common/api.h b/tests/common/api.h
index 35a8037..cadbcb8 100644
--- a/tests/common/api.h
+++ b/tests/common/api.h
@@ -26,7 +26,6 @@
 
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
-#include "cpuset.h"
 
 /*
  * Machine parameters.
@@ -231,16 +230,12 @@ static void wait_all_threads(void)
 
 static void run_on(int cpu)
 {
-#if HAVE_SCHED_SETAFFINITY
+#ifdef HAVE_SCHED_SETAFFINITY
 	cpu_set_t mask;
 
 	CPU_ZERO(&mask);
 	CPU_SET(cpu, &mask);
-#if SCHED_SETAFFINITY_ARGS == 2
-	sched_setaffinity(0, &mask);
-#else
 	sched_setaffinity(0, sizeof(mask), &mask);
-#endif
 #endif /* HAVE_SCHED_SETAFFINITY */
 }
 
@@ -248,6 +243,7 @@ static void run_on(int cpu)
  * timekeeping -- very crude -- should use MONOTONIC...
  */
 
+static inline
 long long get_microseconds(void)
 {
 	struct timeval tv;