From c869f3cdcd023eec2f767eb4094caa88178717a4 Mon Sep 17 00:00:00 2001 From: Henrik Austad Date: Tue, 6 Oct 2015 11:08:23 +0200 Subject: cyclictest: move redefine of CPUSET back to uclib This was mistakenly included in the #ifdef in 88af643971b9 (android: adjust target for android). Moved back into the correct #ifdef-entry. Cc: Clark Williams Cc: John Kacur Signed-off-by: Henrik Austad Signed-off-by: John Kacur --- src/cyclictest/cyclictest.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c index 58f1983..b1f99ab 100644 --- a/src/cyclictest/cyclictest.c +++ b/src/cyclictest/cyclictest.c @@ -78,6 +78,11 @@ int sched_setaffinity (__pid_t __pid, size_t __cpusetsize, return -EINVAL; } +#undef CPU_SET +#undef CPU_ZERO +#define CPU_SET(cpu, cpusetp) +#define CPU_ZERO(cpusetp) + #endif #ifdef NO_PTHREAD_SETAFFINITY @@ -87,11 +92,6 @@ static inline int pthread_setaffinity_np(pthread_t thread, size_t cpusetsize, return sched_setaffinity(0, cpusetsize, cpuset); } -#undef CPU_SET -#undef CPU_ZERO -#define CPU_SET(cpu, cpusetp) -#define CPU_ZERO(cpusetp) - #else extern int clock_nanosleep(clockid_t __clock_id, int __flags, __const struct timespec *__req, -- cgit 1.2.3-korg