diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 14:27:06 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 14:27:06 +1100 |
| commit | 8b1cb56e5b44609c8605949269c1faabe2983777 (patch) | |
| tree | b0449231906fcc32be22f5adcfb3ce1eec8ae09f /include | |
| parent | ff7a3509f7956a8d0ae6edd1785e58923ec7ed3b (diff) | |
| parent | e2f74f355e9e2914483db10c05d70e69e0b7ae04 (diff) | |
Merge remote branch 'cpufreq/next'
Conflicts:
include/acpi/processor.h
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 a920237f7c62..29245c6b5c0e 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, int event_flag); +extern int acpi_processor_get_bios_limit(int cpu, unsigned int *limit); #else static inline void acpi_processor_ppc_init(void) { @@ -317,6 +318,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 79a2340d83cd..4de02b10007f 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); |