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

Commit d7fa706c authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Revert earlier powernow-k8 change



Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 95d769aa
Loading
Loading
Loading
Loading
+3 −4
Original line number Original line Diff line number Diff line
@@ -55,7 +55,7 @@ static DEFINE_MUTEX(fidvid_mutex);
static struct powernow_k8_data *powernow_data[NR_CPUS];
static struct powernow_k8_data *powernow_data[NR_CPUS];


#ifndef CONFIG_SMP
#ifndef CONFIG_SMP
static cpumask_t cpu_core_map[1] = { CPU_MASK_ALL };
static cpumask_t cpu_core_map[1];
#endif
#endif


/* Return a frequency in MHz, given an input fid */
/* Return a frequency in MHz, given an input fid */
@@ -977,7 +977,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
{
{
	struct powernow_k8_data *data;
	struct powernow_k8_data *data;
	cpumask_t oldmask = CPU_MASK_ALL;
	cpumask_t oldmask = CPU_MASK_ALL;
	int rc, i;
	int rc;


	if (!cpu_online(pol->cpu))
	if (!cpu_online(pol->cpu))
		return -ENODEV;
		return -ENODEV;
@@ -1063,8 +1063,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
	printk("cpu_init done, current fid 0x%x, vid 0x%x\n",
	printk("cpu_init done, current fid 0x%x, vid 0x%x\n",
	       data->currfid, data->currvid);
	       data->currfid, data->currvid);


	for_each_cpu_mask(i, cpu_core_map[pol->cpu])
	powernow_data[pol->cpu] = data;
		powernow_data[i] = data;


	return 0;
	return 0;