Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34f25476 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Fix compile failure in cpufreq.c
parents 2e316730 5e1596f7

drivers/cpufreq/cpufreq.c

+4 −3
Original line number Diff line number Diff line
@@ -776,9 +776,6 @@ static int cpufreq_add_dev(struct sys_device *sys_dev) 
	struct sys_device *cpu_sys_dev;

	unsigned long flags;

	unsigned int j;

#ifdef CONFIG_SMP

	struct cpufreq_policy *managed_policy;

#endif



	if (cpu_is_offline(cpu))

		return 0;
@@ -854,6 +851,8 @@ static int cpufreq_add_dev(struct sys_device *sys_dev) 
#endif



	for_each_cpu(j, policy->cpus) {

		struct cpufreq_policy *managed_policy;



		if (cpu == j)

			continue;
@@ -932,6 +931,8 @@ static int cpufreq_add_dev(struct sys_device *sys_dev) 


	/* symlink affected CPUs */

	for_each_cpu(j, policy->cpus) {

		struct cpufreq_policy *managed_policy;



		if (j == cpu)

			continue;

		if (!cpu_online(j))