The condition that numa_on_and_available() checks is impossible to hit,
as it's already being checked during process_options().
Removal of numa_on_and_available() also has the side effect of removing
the following warning during build:
src/cyclictest/rt_numa.h:259:15: warning: implicit declaration of function ‘numa_available’ [-Wimplicit-function-declaration]
Signed-off-by: Josh Cartwright <joshc@xxxxxx>
---
src/cyclictest/cyclictest.c | 3 ---
src/cyclictest/rt_numa.h | 9 ---------
2 files changed, 12 deletions(-)
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 4ced67f..dc754fd 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1816,9 +1816,6 @@ int main(int argc, char **argv)
if (verbose)
printf("Max CPUs = %d\n", max_cpus);
- /* Checks if numa is on, program exits if numa on but not available */
- numa_on_and_available();
-
/* lock all memory (prevent swapping) */
if (lockall)
if (mlockall(MCL_CURRENT|MCL_FUTURE) == -1) {
diff --git a/src/cyclictest/rt_numa.h b/src/cyclictest/rt_numa.h
index 06c9420..caa80e6 100644
--- a/src/cyclictest/rt_numa.h
+++ b/src/cyclictest/rt_numa.h
@@ -251,15 +251,6 @@ static inline void rt_bitmask_free(struct bitmask *mask)
#endif /* NUMA */
-/*
- * Any behavioral differences above are transparent to these functions
- */
-static void numa_on_and_available()
-{
- if (numa && (numa_available() == -1))
- fatal("--numa specified and numa functions not available.\n");
-}
-
/** Returns number of bits set in mask. */
static inline unsigned int rt_numa_bitmask_count(const struct bitmask *mask)
{
--
2.5.0
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
