diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-02-14 10:40:48 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-02-14 10:40:48 +0100 |
| commit | 3629ac5b92535793ba6226e243c2324a20c35fae (patch) | |
| tree | e6ace40cdbd0047823637b2bdc2ebdc2f0e10d7e | |
| parent | ACPI: PM: s2idle: Prevent spurious SCIs from waking up the system (diff) | |
| parent | cpufreq: Make cpufreq_global_kobject static (diff) | |
| download | linux-dev-3629ac5b92535793ba6226e243c2324a20c35fae.tar.xz linux-dev-3629ac5b92535793ba6226e243c2324a20c35fae.zip | |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
cpufreq: Make cpufreq_global_kobject static
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 5 | ||||
| -rw-r--r-- | include/linux/cpufreq.h | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 4adac3a8c265..cbe6c94bf158 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -105,6 +105,8 @@ bool have_governor_per_policy(void) } EXPORT_SYMBOL_GPL(have_governor_per_policy); +static struct kobject *cpufreq_global_kobject; + struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy) { if (have_governor_per_policy()) @@ -2745,9 +2747,6 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver) } EXPORT_SYMBOL_GPL(cpufreq_unregister_driver); -struct kobject *cpufreq_global_kobject; -EXPORT_SYMBOL(cpufreq_global_kobject); - static int __init cpufreq_core_init(void) { if (cpufreq_disabled()) diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 018dce868de6..0fb561d1b524 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -201,9 +201,6 @@ static inline bool policy_is_shared(struct cpufreq_policy *policy) return cpumask_weight(policy->cpus) > 1; } -/* /sys/devices/system/cpu/cpufreq: entry point for global variables */ -extern struct kobject *cpufreq_global_kobject; - #ifdef CONFIG_CPU_FREQ unsigned int cpufreq_get(unsigned int cpu); unsigned int cpufreq_quick_get(unsigned int cpu); |