diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-24 15:14:12 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-02-25 21:25:02 +0200 |
| commit | f6e9c6bd978eaf32de099c7f4a16eb9d2f1e5ab1 (patch) | |
| tree | 0d817e9a06da66dbe07239aa69de1ab43bfe190f | |
| parent | f641a59486e69100969f92a7ec309574f76b238d (diff) | |
| download | illumos-joyent-f6e9c6bd978eaf32de099c7f4a16eb9d2f1e5ab1.tar.gz | |
13541 powertop: symbol 'g_turbo_supported' is multiply-defined
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/cmd/powertop/common/powertop.c | 1 | ||||
| -rw-r--r-- | usr/src/cmd/powertop/common/turbo.c | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/usr/src/cmd/powertop/common/powertop.c b/usr/src/cmd/powertop/common/powertop.c index 731ff2af59..9b4188e363 100644 --- a/usr/src/cmd/powertop/common/powertop.c +++ b/usr/src/cmd/powertop/common/powertop.c @@ -72,7 +72,6 @@ state_info_t g_cstate_info[NSTATES]; freq_state_info_t g_pstate_info[NSTATES]; cpu_power_info_t *g_cpu_power_states; -boolean_t g_turbo_supported; boolean_t g_sig_resize; uint_t g_argc; diff --git a/usr/src/cmd/powertop/common/turbo.c b/usr/src/cmd/powertop/common/turbo.c index b2cafe7689..4909b70899 100644 --- a/usr/src/cmd/powertop/common/turbo.c +++ b/usr/src/cmd/powertop/common/turbo.c @@ -62,9 +62,9 @@ static turbo_info_t *t_new = NULL; static int pt_turbo_init(void) { - kstat_ctl_t *kc; - kstat_t *ksp; - kstat_named_t *knp; + kstat_ctl_t *kc; + kstat_t *ksp; + kstat_named_t *knp; /* * check if the CPU turbo is supported @@ -111,10 +111,10 @@ pt_turbo_init(void) static int pt_turbo_snapshot(turbo_info_t *turbo_snapshot) { - kstat_ctl_t *kc; - kstat_t *ksp; - kstat_named_t *knp; - int cpu; + kstat_ctl_t *kc; + kstat_t *ksp; + kstat_named_t *knp; + int cpu; turbo_info_t *turbo_info; if ((kc = kstat_open()) == NULL) |