Merge branch 'pm-cpufreq'

rafaeljw · rafaeljw · commit 3629ac5b9253 · 2020-02-14T10:40:48.000+01:00
* pm-cpufreq:
  cpufreq: Make cpufreq_global_kobject static
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,8 @@ bool have_governor_per_policy(void)`
`105`	`105`	`}`
`106`	`106`	`EXPORT_SYMBOL_GPL(have_governor_per_policy);`
`107`	`107`
	`108`	`+static struct kobject *cpufreq_global_kobject;`
	`109`	`+`
`108`	`110`	`struct kobject get_governor_parent_kobj(struct cpufreq_policy policy)`
`109`	`111`	`{`
`110`	`112`	`if (have_governor_per_policy())`
`@@ -2745,9 +2747,6 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver)`
`2745`	`2747`	`}`
`2746`	`2748`	`EXPORT_SYMBOL_GPL(cpufreq_unregister_driver);`
`2747`	`2749`
`2748`		`-struct kobject *cpufreq_global_kobject;`
`2749`		`-EXPORT_SYMBOL(cpufreq_global_kobject);`
`2750`		`-`
`2751`	`2750`	`static int __init cpufreq_core_init(void)`
`2752`	`2751`	`{`
`2753`	`2752`	`if (cpufreq_disabled())`
Original file line number	Diff line number	Diff line change
`@@ -201,9 +201,6 @@ static inline bool policy_is_shared(struct cpufreq_policy *policy)`
`201`	`201`	`return cpumask_weight(policy->cpus) > 1;`
`202`	`202`	`}`
`203`	`203`
`204`		`-/* /sys/devices/system/cpu/cpufreq: entry point for global variables */`
`205`		`-extern struct kobject *cpufreq_global_kobject;`
`206`		`-`
`207`	`204`	`#ifdef CONFIG_CPU_FREQ`
`208`	`205`	`unsigned int cpufreq_get(unsigned int cpu);`
`209`	`206`	`unsigned int cpufreq_quick_get(unsigned int cpu);`