projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linus
[linux-drm-fsl-dcu.git]
/
arch
/
ia64
/
kernel
/
cpufreq
/
acpi-cpufreq.c
diff --git
a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
index 86faf221a070e59f48d1a11cf308d5ca2899f750..088f130197ae5240f63db2dc02bbc4b7fa213025 100644
(file)
--- a/
arch/ia64/kernel/cpufreq/acpi-cpufreq.c
+++ b/
arch/ia64/kernel/cpufreq/acpi-cpufreq.c
@@
-68,7
+68,8
@@
processor_get_pstate (
dprintk("processor_get_pstate\n");
dprintk("processor_get_pstate\n");
- retval = ia64_pal_get_pstate(&pstate_index);
+ retval = ia64_pal_get_pstate(&pstate_index,
+ PAL_GET_PSTATE_TYPE_INSTANT);
*value = (u32) pstate_index;
if (retval)
*value = (u32) pstate_index;
if (retval)
@@
-91,7
+92,7
@@
extract_clock (
dprintk("extract_clock\n");
for (i = 0; i < data->acpi_data.state_count; i++) {
dprintk("extract_clock\n");
for (i = 0; i < data->acpi_data.state_count; i++) {
- if (value
>= data->acpi_data.states[i].control
)
+ if (value
== data->acpi_data.states[i].status
)
return data->acpi_data.states[i].core_frequency;
}
return data->acpi_data.states[i-1].core_frequency;
return data->acpi_data.states[i].core_frequency;
}
return data->acpi_data.states[i-1].core_frequency;
@@
-117,11
+118,7
@@
processor_get_freq (
goto migrate_end;
}
goto migrate_end;
}
- /*
- * processor_get_pstate gets the average frequency since the
- * last get. So, do two PAL_get_freq()...
- */
- ret = processor_get_pstate(&value);
+ /* processor_get_pstate gets the instantaneous frequency */
ret = processor_get_pstate(&value);
if (ret) {
ret = processor_get_pstate(&value);
if (ret) {