git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
processor_perflib.c
diff --git
a/drivers/acpi/processor_perflib.c
b/drivers/acpi/processor_perflib.c
index 2cabadcc4d8c36806bc886080a6c0cae3d50dd04..d648a9860b88d2557e13ae958c2a7e3b0480464b 100644
(file)
--- a/
drivers/acpi/processor_perflib.c
+++ b/
drivers/acpi/processor_perflib.c
@@
-413,7
+413,11
@@
static int acpi_processor_get_performance_info(struct acpi_processor *pr)
if (result)
goto update_bios;
if (result)
goto update_bios;
- return 0;
+ /* We need to call _PPC once when cpufreq starts */
+ if (ignore_ppc != 1)
+ result = acpi_processor_get_platform_limit(pr);
+
+ return result;
/*
* Having _PPC but missing frequencies (_PSS, _PCT) is a very good hint that
/*
* Having _PPC but missing frequencies (_PSS, _PCT) is a very good hint that
@@
-557,7
+561,7
@@
end:
}
int acpi_processor_preregister_performance(
}
int acpi_processor_preregister_performance(
- struct acpi_processor_performance *performance)
+ struct acpi_processor_performance
__percpu
*performance)
{
int count, count_target;
int retval = 0;
{
int count, count_target;
int retval = 0;