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

Commit 9af6b056 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'fixes-25' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] fix section mismatch warnings
  [CPUFREQ] Remove debugging message from e_powersaver
  [CPUFREQ] Fix missing cpufreq_cpu_put() call in ->store
  [CPUFREQ] Fix missing cpufreq_cpu_put() call in ->show
parents 8cce3e7c f6ebef30

arch/x86/kernel/cpu/cpufreq/e_powersaver.c

+6 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ static int eps_set_state(struct eps_cpu_data *centaur, 
{

	struct cpufreq_freqs freqs;

	u32 lo, hi;

	u8 current_multiplier, current_voltage;

	int err = 0;

	int i;
@@ -95,6 +94,10 @@ static int eps_set_state(struct eps_cpu_data *centaur, 
	rdmsr(MSR_IA32_PERF_STATUS, lo, hi);

	freqs.new = centaur->fsb * ((lo >> 8) & 0xff);



#ifdef DEBUG

	{

	u8 current_multiplier, current_voltage;



	/* Print voltage and multiplier */

	rdmsr(MSR_IA32_PERF_STATUS, lo, hi);

	current_voltage = lo & 0xff;
@@ -103,7 +106,8 @@ static int eps_set_state(struct eps_cpu_data *centaur, 
	current_multiplier = (lo >> 8) & 0xff;

	printk(KERN_INFO "eps: Current multiplier = %d\n",

		current_multiplier);



	}

#endif

	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

	return err;

}

drivers/cpufreq/cpufreq.c

+11 −9
Original line number Diff line number Diff line
@@ -671,13 +671,13 @@ static ssize_t show(struct kobject * kobj, struct attribute * attr ,char * buf) 
{

	struct cpufreq_policy * policy = to_policy(kobj);

	struct freq_attr * fattr = to_attr(attr);

	ssize_t ret;

	ssize_t ret = -EINVAL;

	policy = cpufreq_cpu_get(policy->cpu);

	if (!policy)

		return -EINVAL;

		goto no_policy;



	if (lock_policy_rwsem_read(policy->cpu) < 0)

		return -EINVAL;

		goto fail;



	if (fattr->show)

		ret = fattr->show(policy, buf);
@@ -685,8 +685,9 @@ static ssize_t show(struct kobject * kobj, struct attribute * attr ,char * buf) 
		ret = -EIO;



	unlock_policy_rwsem_read(policy->cpu);



fail:

	cpufreq_cpu_put(policy);

no_policy:

	return ret;

}
@@ -695,13 +696,13 @@ static ssize_t store(struct kobject * kobj, struct attribute * attr, 
{

	struct cpufreq_policy * policy = to_policy(kobj);

	struct freq_attr * fattr = to_attr(attr);

	ssize_t ret;

	ssize_t ret = -EINVAL;

	policy = cpufreq_cpu_get(policy->cpu);

	if (!policy)

		return -EINVAL;

		goto no_policy;



	if (lock_policy_rwsem_write(policy->cpu) < 0)

		return -EINVAL;

		goto fail;



	if (fattr->store)

		ret = fattr->store(policy, buf, count);
@@ -709,8 +710,9 @@ static ssize_t store(struct kobject * kobj, struct attribute * attr, 
		ret = -EIO;



	unlock_policy_rwsem_write(policy->cpu);



fail:

	cpufreq_cpu_put(policy);

no_policy:

	return ret;

}
@@ -1775,7 +1777,7 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb, 
	return NOTIFY_OK;

}



static struct notifier_block __cpuinitdata cpufreq_cpu_notifier =

static struct notifier_block __refdata cpufreq_cpu_notifier =

{

    .notifier_call = cpufreq_cpu_callback,

};

drivers/cpufreq/cpufreq_stats.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb, 
	return NOTIFY_OK;

}



static struct notifier_block cpufreq_stat_cpu_notifier __cpuinitdata =

static struct notifier_block cpufreq_stat_cpu_notifier __refdata =

{

	.notifier_call = cpufreq_stat_cpu_callback,

};