From 54b1ce911cf6f284f06150073226760826b43561 Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Mon, 18 Jun 2018 23:22:57 +0200
Subject: [PATCH] Revert "shuffle numa options around a bit"

Redoing the removal of the numa option

This reverts commit 1e4b4dc250ed593fdf7fcbe0eac77b3dfeeaf522.

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 src/cyclictest/cyclictest.c | 11 +++++------
 src/cyclictest/rt_numa.h    |  2 ++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index f1a4798..b93792a 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1713,9 +1713,7 @@ static void trigger_update(struct thread_param *par, int diff, int64_t ts)
 void get_cpu_affinity(struct bitmask *cpus)
 {
 	struct bitmask *bitmask = numa_allocate_cpumask();
-#if NUMA
-	numa_sched_getaffinity(0, bitmask);
-#else
+#if 0
 	int i, max_cpus = numa_num_configured_cpus();
 	cpu_set_t mask;
 	int ret = sched_getaffinity(0, sizeof(mask), &mask);
@@ -1731,9 +1729,10 @@ void get_cpu_affinity(struct bitmask *cpus)
 			numa_bitmask_setbit(bitmask, i);
 		}
 	}
+#else
+	numa_sched_getaffinity(0, bitmask);
 #endif
-	/* copy the contents to our argument */
-	*cpus = *bitmask;
+	cpus = bitmask;
 }
 
 int main(int argc, char **argv)
@@ -1744,7 +1743,7 @@ int main(int argc, char **argv)
 	int max_cpus = sysconf(_SC_NPROCESSORS_ONLN);
 	int i, ret = -1;
 	int status;
-	int numa = numa_available() == 0 ? 1 : 0;
+	int numa = numa_available();
 
 	get_cpu_affinity(&allowed_cpus);
 
diff --git a/src/cyclictest/rt_numa.h b/src/cyclictest/rt_numa.h
index 9614a62..915cb5f 100644
--- a/src/cyclictest/rt_numa.h
+++ b/src/cyclictest/rt_numa.h
@@ -23,6 +23,8 @@
 #include "rt-utils.h"
 #include "error.h"
 
+static int numa = 0;
+
 #ifdef NUMA
 #include <numa.h>