Commit 4650b279 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpuidle' and 'pm-cpufreq' 

* pm-cpuidle:
  cpuidle: governor: Add new governors to cpuidle_governors again
  cpuidle: menu: Avoid overflows when computing variance

* pm-cpufreq:
  cpufreq: intel_pstate: Fix up iowait_boost computation
  cpufreq: pxa2xx: remove incorrect __init annotation
  cpufreq: Improve kerneldoc comments for cpufreq_cpu_get/put()
parents e6035258 22782b3f 8e3b4039

drivers/cpufreq/cpufreq.c

+9 −15
Original line number Diff line number Diff line
@@ -206,17 +206,15 @@ unsigned int cpufreq_generic_get(unsigned int cpu) 
EXPORT_SYMBOL_GPL(cpufreq_generic_get);



/**

 * cpufreq_cpu_get: returns policy for a cpu and marks it busy.

 * cpufreq_cpu_get - Return policy for a CPU and mark it as busy.

 * @cpu: CPU to find the policy for.

 *

 * @cpu: cpu to find policy for.

 * Call cpufreq_cpu_get_raw() to obtain a cpufreq policy for @cpu and increment

 * the kobject reference counter of that policy.  Return a valid policy on

 * success or NULL on failure.

 *

 * This returns policy for 'cpu', returns NULL if it doesn't exist.

 * It also increments the kobject reference count to mark it busy and so would

 * require a corresponding call to cpufreq_cpu_put() to decrement it back.

 * If corresponding call cpufreq_cpu_put() isn't made, the policy wouldn't be

 * freed as that depends on the kobj count.

 *

 * Return: A valid policy on success, otherwise NULL on failure.

 * The policy returned by this function has to be released with the help of

 * cpufreq_cpu_put() to balance its kobject reference counter properly.

 */

struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu)

{
@@ -243,12 +241,8 @@ struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu) 
EXPORT_SYMBOL_GPL(cpufreq_cpu_get);



/**

 * cpufreq_cpu_put: Decrements the usage count of a policy

 *

 * @policy: policy earlier returned by cpufreq_cpu_get().

 *

 * This decrements the kobject reference count incremented earlier by calling

 * cpufreq_cpu_get().

 * cpufreq_cpu_put - Decrement kobject usage counter for cpufreq policy.

 * @policy: cpufreq policy returned by cpufreq_cpu_get().

 */

void cpufreq_cpu_put(struct cpufreq_policy *policy)

{

drivers/cpufreq/intel_pstate.c

+1 −1
Original line number Diff line number Diff line
@@ -1762,7 +1762,7 @@ static void intel_pstate_update_util(struct update_util_data *data, u64 time, 
		/* Start over if the CPU may have been idle. */

		if (delta_ns > TICK_NSEC) {

			cpu->iowait_boost = ONE_EIGHTH_FP;

		} else if (cpu->iowait_boost) {

		} else if (cpu->iowait_boost >= ONE_EIGHTH_FP) {

			cpu->iowait_boost <<= 1;

			if (cpu->iowait_boost > int_tofp(1))

				cpu->iowait_boost = int_tofp(1);

drivers/cpufreq/pxa2xx-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static int pxa_cpufreq_change_voltage(const struct pxa_freqs *pxa_freq) 
	return ret;

}



static void __init pxa_cpufreq_init_voltages(void)

static void pxa_cpufreq_init_voltages(void)

{

	vcc_core = regulator_get(NULL, "vcc_core");

	if (IS_ERR(vcc_core)) {
@@ -159,7 +159,7 @@ static int pxa_cpufreq_change_voltage(const struct pxa_freqs *pxa_freq) 
	return 0;

}



static void __init pxa_cpufreq_init_voltages(void) { }

static void pxa_cpufreq_init_voltages(void) { }

#endif



static void find_freq_tables(struct cpufreq_frequency_table **freq_table,

drivers/cpuidle/governor.c

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov) 
	mutex_lock(&cpuidle_lock);

	if (__cpuidle_find_governor(gov->name) == NULL) {

		ret = 0;

		list_add_tail(&gov->governor_list, &cpuidle_governors);

		if (!cpuidle_curr_governor ||

		    !strncasecmp(param_governor, gov->name, CPUIDLE_NAME_LEN) ||

		    (cpuidle_curr_governor->rating < gov->rating &&

drivers/cpuidle/governors/menu.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static unsigned int get_typical_interval(struct menu_device *data, 
	unsigned int min, max, thresh, avg;

	uint64_t sum, variance;



	thresh = UINT_MAX; /* Discard outliers above this value */

	thresh = INT_MAX; /* Discard outliers above this value */



again: