[PATCH 4/4] cyclictest: move redefine of CPUSET back to uclib
From: Henrik Austad <hidden>
Date: 2015-10-06 09:11:33
Subsystem:
the rest · Maintainer:
Linus Torvalds
This was mistakenly included in the #ifdef in 88af643971b9 (android: adjust target for android). Moved back into the correct #ifdef-entry. Cc: Clark Williams <redacted> Cc: John Kacur <jkacur@redhat.com> Signed-off-by: Henrik Austad <redacted> --- 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 b52cabd..87a2d7e 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c@@ -80,6 +80,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
@@ -89,11 +94,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)