diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-22 13:49:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-22 13:49:43 +1000 |
| commit | b8739de01851af6f2b29b179153bc55da75d186a (patch) | |
| tree | 675a05289e7ef18ba0cd8125a0e13c1e6f647b51 /include | |
| parent | 98313a20104c77b18ffccf36298e8eb384c2da5a (diff) | |
| parent | 621114980de1e236ffa4e72899e226de75031a5f (diff) | |
Merge commit 'cpufreq/next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpufreq.h | 7 | ||||
| -rw-r--r-- | include/linux/tick.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 6fd5668aa572..1ee608fd7b77 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -187,7 +187,8 @@ extern int __cpufreq_driver_target(struct cpufreq_policy *policy, unsigned int relation); -extern int __cpufreq_driver_getavg(struct cpufreq_policy *policy); +extern int __cpufreq_driver_getavg(struct cpufreq_policy *policy, + unsigned int cpu); int cpufreq_register_governor(struct cpufreq_governor *governor); void cpufreq_unregister_governor(struct cpufreq_governor *governor); @@ -226,7 +227,9 @@ struct cpufreq_driver { unsigned int (*get) (unsigned int cpu); /* optional */ - unsigned int (*getavg) (unsigned int cpu); + unsigned int (*getavg) (struct cpufreq_policy *policy, + unsigned int cpu); + int (*exit) (struct cpufreq_policy *policy); int (*suspend) (struct cpufreq_policy *policy, pm_message_t pmsg); int (*resume) (struct cpufreq_policy *policy); diff --git a/include/linux/tick.h b/include/linux/tick.h index d3c02695dc5d..3bcacb71447a 100644 --- a/include/linux/tick.h +++ b/include/linux/tick.h @@ -123,7 +123,7 @@ static inline ktime_t tick_nohz_get_sleep_length(void) return len; } static inline void tick_nohz_stop_idle(int cpu) { } -static inline u64 get_cpu_idle_time_us(int cpu, u64 *unused) { return 0; } +static inline u64 get_cpu_idle_time_us(int cpu, u64 *unused) { return -1; } # endif /* !NO_HZ */ #endif |