Merge branch 'pm-cpufreq' (3629ac5b) · Commits · 戴 / test

drivers/cpufreq/cpufreq.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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())

+0 −3

Original line number	Diff line number	Diff line
		@@ -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);