From 5826fa6cae1910c5635430961069d0b78b25bcb5 Mon Sep 17 00:00:00 2001 From: Joachim Deguara Date: Tue, 30 Jan 2007 16:53:54 +0100 Subject: [PATCH] --- yaml --- r: 48626 b: refs/heads/master c: 58389a86df48ff927846df9537ea34d9961b5c44 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/cpu/cpufreq/powernow-k8.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a9f3d650af90..87720999ca23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14796722839ee50ed2a2c7a6a135e7d0888aaada +refs/heads/master: 58389a86df48ff927846df9537ea34d9961b5c44 diff --git a/trunk/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/trunk/arch/i386/kernel/cpu/cpufreq/powernow-k8.c index 2d6491672559..fe3b67005ebb 100644 --- a/trunk/arch/i386/kernel/cpu/cpufreq/powernow-k8.c +++ b/trunk/arch/i386/kernel/cpu/cpufreq/powernow-k8.c @@ -1289,7 +1289,11 @@ static unsigned int powernowk8_get (unsigned int cpu) if (query_current_values_with_pending_wait(data)) goto out; - khz = find_khz_freq_from_fid(data->currfid); + if (cpu_family == CPU_HW_PSTATE) + khz = find_khz_freq_from_fiddid(data->currfid, data->currdid); + else + khz = find_khz_freq_from_fid(data->currfid); + out: set_cpus_allowed(current, oldmask);