Commit c63fdeee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq 

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] powernow-k8.c: fix a check-after-use
  [CPUFREQ] Remove duplicate check in powernow-k8
  [CPUFREQ] drivers/cpufreq/cpufreq.c: static functions mustn't be exported
  [CPUFREQ] If max_freq got reduced (e.g. by _PPC) a write to sysfs scaling_governor let cpufreq core stuck at low max_freq for ever
  [CPUFREQ] x86_64: Proper null pointer check in powernow_k8_get
  [CPUFREQ] x86_64: Revert earlier powernow-k8 change
  [CPUFREQ] Update LART site URL
  [CPUFREQ] Remove pointless check in conservative governor.
  [CPUFREQ] trailing whitespace removal de-jour.
  [CPUFREQ] extra debugging in cpufreq_add_dev()
parents c63f774c 9180053c

Documentation/cpu-freq/index.txt

+1 −1
Original line number Diff line number Diff line
@@ -53,4 +53,4 @@ the CPUFreq Mailing list: 
* http://lists.linux.org.uk/mailman/listinfo/cpufreq



Clock and voltage scaling for the SA-1100:

* http://www.lart.tudelft.nl/projects/scaling
 
* http://www.lartmaker.nl/projects/scaling

arch/i386/kernel/cpu/cpufreq/powernow-k8.c

+5 −5
Original line number Diff line number Diff line
@@ -905,14 +905,17 @@ static int powernowk8_target(struct cpufreq_policy *pol, unsigned targfreq, unsi 
{

	cpumask_t oldmask = CPU_MASK_ALL;

	struct powernow_k8_data *data = powernow_data[pol->cpu];

	u32 checkfid = data->currfid;

	u32 checkvid = data->currvid;

	u32 checkfid;

	u32 checkvid;

	unsigned int newstate;

	int ret = -EIO;



	if (!data)

		return -EINVAL;



	checkfid = data->currfid;

	checkvid = data->currvid;



	/* only run on specific CPU from here on */

	oldmask = current->cpus_allowed;

	set_cpus_allowed(current, cpumask_of_cpu(pol->cpu));
@@ -1106,9 +1109,6 @@ static unsigned int powernowk8_get (unsigned int cpu) 


	data = powernow_data[first_cpu(cpu_core_map[cpu])];



	if (!data)

		return -EINVAL;



	if (!data)

		return -EINVAL;

drivers/cpufreq/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ config CPU_FREQ_GOV_USERSPACE 
	  Enable this cpufreq governor when you either want to set the

	  CPU frequency manually or when an userspace program shall

	  be able to set the CPU dynamically, like on LART 

	  <http://www.lart.tudelft.nl/>

	  <http://www.lartmaker.nl/>.



	  For details, take a look at <file:Documentation/cpu-freq/>.

drivers/cpufreq/cpufreq.c

+18 −7
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ out: 
	}

	return -EINVAL;

}

EXPORT_SYMBOL_GPL(cpufreq_parse_governor);





/* drivers/base/cpu.c */
@@ -346,6 +345,8 @@ show_one(scaling_min_freq, min); 
show_one(scaling_max_freq, max);

show_one(scaling_cur_freq, cur);



static int __cpufreq_set_policy(struct cpufreq_policy *data, struct cpufreq_policy *policy);



/**

 * cpufreq_per_cpu_attr_write() / store_##file_name() - sysfs write access

 */
@@ -364,7 +365,10 @@ static ssize_t store_##file_name \ 
	if (ret != 1)							\

		return -EINVAL;						\

									\

	ret = cpufreq_set_policy(&new_policy);				\

	mutex_lock(&policy->lock);					\

	ret = __cpufreq_set_policy(policy, &new_policy);		\

	policy->user_policy.object = policy->object;			\

	mutex_unlock(&policy->lock);					\

									\

	return ret ? ret : count;					\

}
@@ -420,7 +424,15 @@ static ssize_t store_scaling_governor (struct cpufreq_policy * policy, 
	if (cpufreq_parse_governor(str_governor, &new_policy.policy, &new_policy.governor))

		return -EINVAL;



	ret = cpufreq_set_policy(&new_policy);

	/* Do not use cpufreq_set_policy here or the user_policy.max

	   will be wrongly overridden */

	mutex_lock(&policy->lock);

	ret = __cpufreq_set_policy(policy, &new_policy);



	policy->user_policy.policy = policy->policy;

	policy->user_policy.governor = policy->governor;

	mutex_unlock(&policy->lock);



	return ret ? ret : count;

}
@@ -685,7 +697,7 @@ static int cpufreq_add_dev (struct sys_device * sys_dev) 
		if (!cpu_online(j))

			continue;



		dprintk("CPU already managed, adding link\n");

		dprintk("CPU %u already managed, adding link\n", j);

		cpufreq_cpu_get(cpu);

		cpu_sys_dev = get_cpu_sysdev(j);

		sysfs_create_link(&cpu_sys_dev->kobj, &policy->kobj,
@@ -697,7 +709,6 @@ static int cpufreq_add_dev (struct sys_device * sys_dev) 
	mutex_unlock(&policy->lock);



	/* set default policy */

	

	ret = cpufreq_set_policy(&new_policy);

	if (ret) {

		dprintk("setting policy failed\n");

drivers/cpufreq/cpufreq_conservative.c

+2 −4
Original line number Diff line number Diff line
@@ -176,8 +176,7 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused, 
	ret = sscanf (buf, "%u", &input);



	mutex_lock(&dbs_mutex);

	if (ret != 1 || input > 100 || input < 0 ||

			input <= dbs_tuners_ins.down_threshold) {

	if (ret != 1 || input > 100 || input <= dbs_tuners_ins.down_threshold) {

		mutex_unlock(&dbs_mutex);

		return -EINVAL;

	}
@@ -196,8 +195,7 @@ static ssize_t store_down_threshold(struct cpufreq_policy *unused, 
	ret = sscanf (buf, "%u", &input);



	mutex_lock(&dbs_mutex);

	if (ret != 1 || input > 100 || input < 0 ||

			input >= dbs_tuners_ins.up_threshold) {

	if (ret != 1 || input > 100 || input >= dbs_tuners_ins.up_threshold) {

		mutex_unlock(&dbs_mutex);

		return -EINVAL;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE