diff options
Diffstat (limited to 'tools/power/cpupower/utils/helpers')
| -rw-r--r-- | tools/power/cpupower/utils/helpers/cpuid.c | 4 | ||||
| -rw-r--r-- | tools/power/cpupower/utils/helpers/helpers.h | 5 | ||||
| -rw-r--r-- | tools/power/cpupower/utils/helpers/misc.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/tools/power/cpupower/utils/helpers/cpuid.c b/tools/power/cpupower/utils/helpers/cpuid.c index 39c2c7d067bb..32d37c9be791 100644 --- a/tools/power/cpupower/utils/helpers/cpuid.c +++ b/tools/power/cpupower/utils/helpers/cpuid.c | |||
| @@ -42,7 +42,7 @@ cpuid_func(edx); | |||
| 42 | * | 42 | * |
| 43 | * TBD: Should there be a cpuid alternative for this if /proc is not mounted? | 43 | * TBD: Should there be a cpuid alternative for this if /proc is not mounted? |
| 44 | */ | 44 | */ |
| 45 | int get_cpu_info(unsigned int cpu, struct cpupower_cpu_info *cpu_info) | 45 | int get_cpu_info(struct cpupower_cpu_info *cpu_info) |
| 46 | { | 46 | { |
| 47 | FILE *fp; | 47 | FILE *fp; |
| 48 | char value[64]; | 48 | char value[64]; |
| @@ -70,7 +70,7 @@ int get_cpu_info(unsigned int cpu, struct cpupower_cpu_info *cpu_info) | |||
| 70 | if (!strncmp(value, "processor\t: ", 12)) | 70 | if (!strncmp(value, "processor\t: ", 12)) |
| 71 | sscanf(value, "processor\t: %u", &proc); | 71 | sscanf(value, "processor\t: %u", &proc); |
| 72 | 72 | ||
| 73 | if (proc != cpu) | 73 | if (proc != (unsigned int)base_cpu) |
| 74 | continue; | 74 | continue; |
| 75 | 75 | ||
| 76 | /* Get CPU vendor */ | 76 | /* Get CPU vendor */ |
diff --git a/tools/power/cpupower/utils/helpers/helpers.h b/tools/power/cpupower/utils/helpers/helpers.h index 799a18be60aa..41da392be448 100644 --- a/tools/power/cpupower/utils/helpers/helpers.h +++ b/tools/power/cpupower/utils/helpers/helpers.h | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | /* Internationalization ****************************/ | 34 | /* Internationalization ****************************/ |
| 35 | 35 | ||
| 36 | extern int run_as_root; | 36 | extern int run_as_root; |
| 37 | extern int base_cpu; | ||
| 37 | extern struct bitmask *cpus_chosen; | 38 | extern struct bitmask *cpus_chosen; |
| 38 | 39 | ||
| 39 | /* Global verbose (-d) stuff *********************************/ | 40 | /* Global verbose (-d) stuff *********************************/ |
| @@ -87,11 +88,11 @@ struct cpupower_cpu_info { | |||
| 87 | * | 88 | * |
| 88 | * Extract CPU vendor, family, model, stepping info from /proc/cpuinfo | 89 | * Extract CPU vendor, family, model, stepping info from /proc/cpuinfo |
| 89 | * | 90 | * |
| 90 | * Returns 0 on success or a negativ error code | 91 | * Returns 0 on success or a negative error code |
| 91 | * Only used on x86, below global's struct values are zero/unknown on | 92 | * Only used on x86, below global's struct values are zero/unknown on |
| 92 | * other archs | 93 | * other archs |
| 93 | */ | 94 | */ |
| 94 | extern int get_cpu_info(unsigned int cpu, struct cpupower_cpu_info *cpu_info); | 95 | extern int get_cpu_info(struct cpupower_cpu_info *cpu_info); |
| 95 | extern struct cpupower_cpu_info cpupower_cpu_info; | 96 | extern struct cpupower_cpu_info cpupower_cpu_info; |
| 96 | /* cpuid and cpuinfo helpers **************************/ | 97 | /* cpuid and cpuinfo helpers **************************/ |
| 97 | 98 | ||
diff --git a/tools/power/cpupower/utils/helpers/misc.c b/tools/power/cpupower/utils/helpers/misc.c index 601d719d4e60..a5e7ddf19dbd 100644 --- a/tools/power/cpupower/utils/helpers/misc.c +++ b/tools/power/cpupower/utils/helpers/misc.c | |||
| @@ -13,7 +13,7 @@ int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active, | |||
| 13 | 13 | ||
| 14 | *support = *active = *states = 0; | 14 | *support = *active = *states = 0; |
| 15 | 15 | ||
| 16 | ret = get_cpu_info(0, &cpu_info); | 16 | ret = get_cpu_info(&cpu_info); |
| 17 | if (ret) | 17 | if (ret) |
| 18 | return ret; | 18 | return ret; |
| 19 | 19 | ||
