diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 15:59:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 15:59:23 -0800 |
| commit | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (patch) | |
| tree | 8a5e33fc3804f29bbf5c95c2cd28ccbdaa4cf206 /include | |
| parent | cb5228a6949f525dba37d4eb3ee114426fef22c9 (diff) | |
| parent | e2f74f355e9e2914483db10c05d70e69e0b7ae04 (diff) | |
| download | linux-3.10-2fe77b81c77eed92c4c0439f74c8148a295b4a86.tar.gz linux-3.10-2fe77b81c77eed92c4c0439f74c8148a295b4a86.tar.bz2 linux-3.10-2fe77b81c77eed92c4c0439f74c8148a295b4a86.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[ACPI/CPUFREQ] Introduce bios_limit per cpu cpufreq sysfs interface
[CPUFREQ] make internal cpufreq_add_dev_* static
[CPUFREQ] use an enum for speedstep processor identification
[CPUFREQ] Document units for transition latency
[CPUFREQ] Use global sysfs cpufreq structure for conservative governor tunings
[CPUFREQ] Documentation: ABI: /sys/devices/system/cpu/cpu#/cpufreq/
[CPUFREQ] powernow-k6: set transition latency value so ondemand governor can be used
[CPUFREQ] cpumask: don't put a cpumask on the stack in x86...cpufreq/powernow-k8.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/processor.h | 6 | ||||
| -rw-r--r-- | include/linux/cpufreq.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 740ac3ad8fd..8b668ead6d6 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -295,6 +295,7 @@ static inline void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx void acpi_processor_ppc_init(void); void acpi_processor_ppc_exit(void); int acpi_processor_ppc_has_changed(struct acpi_processor *pr); +extern int acpi_processor_get_bios_limit(int cpu, unsigned int *limit); #else static inline void acpi_processor_ppc_init(void) { @@ -316,6 +317,11 @@ static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr) } return 0; } +static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit) +{ + return -ENODEV; +} + #endif /* CONFIG_CPU_FREQ */ /* in processor_throttling.c */ diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 79a2340d83c..4de02b10007 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -232,6 +232,7 @@ struct cpufreq_driver { /* optional */ unsigned int (*getavg) (struct cpufreq_policy *policy, unsigned int cpu); + int (*bios_limit) (int cpu, unsigned int *limit); int (*exit) (struct cpufreq_policy *policy); int (*suspend) (struct cpufreq_policy *policy, pm_message_t pmsg); |