diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 18:01:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 18:01:47 -0700 |
| commit | c63fdeee94f87aafc131e5594ab030638044cc29 (patch) | |
| tree | e0b1f9ed820fc2e95fa2f0663b81afd2d24c9cfc /arch | |
| parent | c63f774ca10efa7cbcbd555c072353e1a7ab7fbe (diff) | |
| parent | 9180053cacfec4aa233a6cabf1256960e75b0abd (diff) | |
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()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/powernow-k8.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c index 7c0e160a214..71fffa17442 100644 --- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c @@ -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)); @@ -1109,9 +1112,6 @@ static unsigned int powernowk8_get (unsigned int cpu) if (!data) return -EINVAL; - if (!data) - return -EINVAL; - set_cpus_allowed(current, cpumask_of_cpu(cpu)); if (smp_processor_id() != cpu) { printk(KERN_ERR PFX "limiting to CPU %d failed in powernowk8_get\n", cpu); |