We assume that numa_parse_cpustring_all() is available.
Older numa libs without it are no-longer supported
Signed-off-by: John Kacur <jkacur@xxxxxxxxxx>
---
Makefile | 8 --------
src/cyclictest/rt_numa.h | 10 ----------
2 files changed, 18 deletions(-)
diff --git a/Makefile b/Makefile
index 1b37ba7216f2..186eccb1c882 100644
--- a/Makefile
+++ b/Makefile
@@ -85,17 +85,9 @@ ifneq ($(filter x86_64 i386 ia64 mips powerpc,$(machinetype)),)
NUMA := 1
endif
-# The default is to assume that you have numa_parse_cpustring_all
-# If you have an older version of libnuma that only has numa_parse_cpustring
-# then compile with
-# make HAVE_PARSE_CPUSTRING_ALL=0
-HAVE_PARSE_CPUSTRING_ALL?=1
ifeq ($(NUMA),1)
CFLAGS += -DNUMA
NUMA_LIBS = -lnuma
- ifeq ($(HAVE_PARSE_CPUSTRING_ALL),1)
- CFLAGS += -DHAVE_PARSE_CPUSTRING_ALL
- endif
endif
include src/arch/android/Makefile
diff --git a/src/cyclictest/rt_numa.h b/src/cyclictest/rt_numa.h
index 1f7c5a482150..466f0b68f801 100644
--- a/src/cyclictest/rt_numa.h
+++ b/src/cyclictest/rt_numa.h
@@ -78,17 +78,7 @@ static inline unsigned int rt_numa_bitmask_isbitset( const struct bitmask *mask,
static inline struct bitmask* rt_numa_parse_cpustring(const char* s,
int max_cpus)
{
-#ifdef HAVE_PARSE_CPUSTRING_ALL /* Currently not defined anywhere. No
- autotools build. */
return numa_parse_cpustring_all(s);
-#else
- /* We really need numa_parse_cpustring_all(), so we can assign threads
- * to cores which are part of an isolcpus set, but early 2.x versions of
- * libnuma do not have this function. A work around should be to run
- * your command with e.g. taskset -c 9-15 <command>
- */
- return numa_parse_cpustring((char *)s);
-#endif
}
static inline void rt_bitmask_free(struct bitmask *mask)
--
2.20.1
