[rt-tests v3 09/16] rt-numa: Remove max_cpus argument from parse_cpusmask
From: Daniel Wagner <hidden>
Date: 2021-01-26 18:42:46
Subsystem:
the rest · Maintainer:
Linus Torvalds
Remove usused max_cpus argument from parse_cpumask(). Signed-off-by: Daniel Wagner <redacted> --- src/cyclictest/cyclictest.c | 4 ++-- src/include/rt-numa.h | 2 +- src/lib/rt-numa.c | 6 +++--- src/oslat/oslat.c | 3 +-- src/signaltest/signaltest.c | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 4e30abbe6035..acd456bd4c4d 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c@@ -1008,12 +1008,12 @@ static void process_options(int argc, char *argv[], int max_cpus) case 'a': case OPT_AFFINITY: if (optarg) { - parse_cpumask(optarg, max_cpus, &affinity_mask); + parse_cpumask(optarg, &affinity_mask); } else if (optind < argc && (atoi(argv[optind]) || argv[optind][0] == '0' || argv[optind][0] == '!')) { - parse_cpumask(argv[optind], max_cpus, &affinity_mask); + parse_cpumask(argv[optind], &affinity_mask); } break; case 'A':
diff --git a/src/include/rt-numa.h b/src/include/rt-numa.h
index 189da3a804e1..446ce54a6ba2 100644
--- a/src/include/rt-numa.h
+++ b/src/include/rt-numa.h@@ -7,6 +7,6 @@ int get_available_cpus(struct bitmask *cpumask); int cpu_for_thread(int thread_num, int max_cpus, struct bitmask *cpumask); -int parse_cpumask(char *str, int max_cpus, struct bitmask **cpumask); +int parse_cpumask(char *str, struct bitmask **cpumask); #endif
diff --git a/src/lib/rt-numa.c b/src/lib/rt-numa.c
index b1bbb8c8052c..3a8441d5151c 100644
--- a/src/lib/rt-numa.c
+++ b/src/lib/rt-numa.c@@ -85,7 +85,7 @@ int cpu_for_thread(int thread_num, int max_cpus, struct bitmask *cpumask) * the user supplied affinity mask and the affinity mask from the run * time environment */ -static void use_current_cpuset(int max_cpus, struct bitmask *cpumask) +static void use_current_cpuset(struct bitmask *cpumask) { struct bitmask *curmask; int i;
@@ -106,7 +106,7 @@ static void use_current_cpuset(int max_cpus, struct bitmask *cpumask) numa_bitmask_free(curmask); } -int parse_cpumask(char *str, int max_cpus, struct bitmask **cpumask) +int parse_cpumask(char *str, struct bitmask **cpumask) { struct bitmask *mask;
@@ -120,7 +120,7 @@ int parse_cpumask(char *str, int max_cpus, struct bitmask **cpumask) return 0; } - use_current_cpuset(max_cpus, mask); + use_current_cpuset(mask); *cpumask = mask; return 0;
diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c
index 5b7e0d5b5d5c..0811079d9f04 100644
--- a/src/oslat/oslat.c
+++ b/src/oslat/oslat.c@@ -716,7 +716,6 @@ int main(int argc, char *argv[]) struct thread *threads; int i, n_cores; struct bitmask *cpu_set = NULL; - int max_cpus = sysconf(_SC_NPROCESSORS_ONLN); #ifdef FRC_MISSING printf("This architecture is not yet supported. "
@@ -743,7 +742,7 @@ int main(int argc, char *argv[]) if (!g.cpu_list) g.cpu_list = strdup("all"); - if (parse_cpumask(g.cpu_list, max_cpus, &cpu_set)) + if (parse_cpumask(g.cpu_list, &cpu_set)) exit(1); n_cores = numa_bitmask_weight(cpu_set);
diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c
index 2ea5e6b58946..0d189483753d 100644
--- a/src/signaltest/signaltest.c
+++ b/src/signaltest/signaltest.c@@ -236,12 +236,12 @@ static void process_options(int argc, char *argv[], unsigned int max_cpus) switch (c) { case 'a': if (optarg) { - parse_cpumask(optarg, max_cpus, &affinity_mask); + parse_cpumask(optarg, &affinity_mask); } else if (optind < argc && (atoi(argv[optind]) || argv[optind][0] == '0' || argv[optind][0] == '!')) { - parse_cpumask(argv[optind], max_cpus, &affinity_mask); + parse_cpumask(argv[optind], &affinity_mask); } if (verbose)
--
2.30.0