Merge "cpufreq: interactive: Move definition of cpufreq_gov_interactive downwards" (81e0b116) · Commits · e / devices / android_kernel_sony_msm8994

drivers/cpufreq/cpufreq_interactive.c

+10 −13

Original line number	Original line	Diff line number	Diff line
	@@ -137,19 +137,6 @@ static unsigned int up_threshold_any_cpu_load;
	static unsigned int sync_freq;		static unsigned int sync_freq;
	static unsigned int up_threshold_any_cpu_freq;		static unsigned int up_threshold_any_cpu_freq;

	static int cpufreq_governor_interactive(struct cpufreq_policy *policy,
	unsigned int event);

	#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE
	static
	#endif
	struct cpufreq_governor cpufreq_gov_interactive = {
	.name = "interactive",
	.governor = cpufreq_governor_interactive,
	.max_transition_latency = 10000000,
	.owner = THIS_MODULE,
	};

	static void cpufreq_interactive_timer_resched(		static void cpufreq_interactive_timer_resched(
	struct cpufreq_interactive_cpuinfo *pcpu)		struct cpufreq_interactive_cpuinfo *pcpu)
	{		{
	@@ -1350,6 +1337,16 @@ static int cpufreq_governor_interactive(struct cpufreq_policy *policy,
	return 0;		return 0;
	}		}

			#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE
			static
			#endif
			struct cpufreq_governor cpufreq_gov_interactive = {
			.name = "interactive",
			.governor = cpufreq_governor_interactive,
			.max_transition_latency = 10000000,
			.owner = THIS_MODULE,
			};

	static void cpufreq_interactive_nop_timer(unsigned long data)		static void cpufreq_interactive_nop_timer(unsigned long data)
	{		{
	}		}