selftests/powerpc: Move pick_online_cpu() up into utils.c

We want to use this in another test, so make it available at the top of
the powerpc selftests tree.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

5 files changed, 31 insertions, 28 deletions

diff --git a/tools/testing/selftests/powerpc/pmu/Makefile b/tools/testing/selftests/powerpc/pmu/Makefile
index 50326cbb372d..ac41a7177f2e 100644
--- a/tools/testing/selftests/powerpc/pmu/Makefile
+++ b/tools/testing/selftests/powerpc/pmu/Makefile
@@ -2,7 +2,7 @@ noarg:
         $(MAKE) -C ../
 
 TEST_PROGS := count_instructions l3_bank_test per_event_excludes
-EXTRA_SOURCES := ../harness.c event.c lib.c
+EXTRA_SOURCES := ../harness.c event.c lib.c ../utils.c
 
 all: $(TEST_PROGS) ebb
 
diff --git a/tools/testing/selftests/powerpc/pmu/lib.c b/tools/testing/selftests/powerpc/pmu/lib.c
index a07104c2afe6..a361ad3334ce 100644
--- a/tools/testing/selftests/powerpc/pmu/lib.c
+++ b/tools/testing/selftests/powerpc/pmu/lib.c
@@ -15,32 +15,6 @@
 #include "lib.h"
 
 
-int pick_online_cpu(void)
-{
-        cpu_set_t mask;
-        int cpu;
-
-        CPU_ZERO(&mask);
-
-        if (sched_getaffinity(0, sizeof(mask), &mask)) {
-                perror("sched_getaffinity");
-                return -1;
-        }
-
-        /* We prefer a primary thread, but skip 0 */
-        for (cpu = 8; cpu < CPU_SETSIZE; cpu += 8)
-                if (CPU_ISSET(cpu, &mask))
-                        return cpu;
-
-        /* Search for anything, but in reverse */
-        for (cpu = CPU_SETSIZE - 1; cpu >= 0; cpu--)
-                if (CPU_ISSET(cpu, &mask))
-                        return cpu;
-
-        printf("No cpus in affinity mask?!\n");
-        return -1;
-}
-
 int bind_to_cpu(int cpu)
 {
         cpu_set_t mask;
diff --git a/tools/testing/selftests/powerpc/pmu/lib.h b/tools/testing/selftests/powerpc/pmu/lib.h
index ca5d72ae3be6..0213af4ff332 100644
--- a/tools/testing/selftests/powerpc/pmu/lib.h
+++ b/tools/testing/selftests/powerpc/pmu/lib.h
@@ -19,7 +19,6 @@ union pipe {
         int fds[2];
 };
 
-extern int pick_online_cpu(void);
 extern int bind_to_cpu(int cpu);
 extern int kill_child_and_wait(pid_t child_pid);
 extern int wait_for_child(pid_t child_pid);
diff --git a/tools/testing/selftests/powerpc/utils.c b/tools/testing/selftests/powerpc/utils.c
index 536113add380..dcf74184bfd0 100644
--- a/tools/testing/selftests/powerpc/utils.c
+++ b/tools/testing/selftests/powerpc/utils.c
@@ -3,10 +3,13 @@
  * Licensed under GPLv2.
  */
 
+#define _GNU_SOURCE     /* For CPU_ZERO etc. */
+
 #include <elf.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <link.h>
+#include <sched.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -56,3 +59,29 @@ out:
         close(fd);
         return result;
 }
+
+int pick_online_cpu(void)
+{
+        cpu_set_t mask;
+        int cpu;
+
+        CPU_ZERO(&mask);
+
+        if (sched_getaffinity(0, sizeof(mask), &mask)) {
+                perror("sched_getaffinity");
+                return -1;
+        }
+
+        /* We prefer a primary thread, but skip 0 */
+        for (cpu = 8; cpu < CPU_SETSIZE; cpu += 8)
+                if (CPU_ISSET(cpu, &mask))
+                        return cpu;
+
+        /* Search for anything, but in reverse */
+        for (cpu = CPU_SETSIZE - 1; cpu >= 0; cpu--)
+                if (CPU_ISSET(cpu, &mask))
+                        return cpu;
+
+        printf("No cpus in affinity mask?!\n");
+        return -1;
+}
diff --git a/tools/testing/selftests/powerpc/utils.h b/tools/testing/selftests/powerpc/utils.h
index fbf2bf530e50..175ac6ad10dd 100644
--- a/tools/testing/selftests/powerpc/utils.h
+++ b/tools/testing/selftests/powerpc/utils.h
@@ -22,6 +22,7 @@ typedef uint8_t u8;
 
 int test_harness(int (test_function)(void), char *name);
 extern void *get_auxv_entry(int type);
+int pick_online_cpu(void);
 
 static inline bool have_hwcap2(unsigned long ftr2)
 {