diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/cpufreq.h | 8 | ||||
-rw-r--r-- | include/linux/mmc/host.h | 2 | ||||
-rw-r--r-- | include/linux/sched.h | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index b0d360c87602..a15944d5a06f 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -17,6 +17,8 @@ #include <linux/kobject.h> #include <linux/notifier.h> #include <linux/sysfs.h> +#include <asm/cputime.h> + /********************************************************************* * CPUFREQ INTERFACE * @@ -509,4 +511,10 @@ static inline int cpufreq_generic_exit(struct cpufreq_policy *policy) return 0; } +/********************************************************************* + * CPUFREQ STATS * + *********************************************************************/ + +void acct_update_power(struct task_struct *p, cputime_t cputime); + #endif /* _LINUX_CPUFREQ_H */ diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 1c923ab2dd73..9b92af47577f 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -15,7 +15,6 @@ #include <linux/sched.h> #include <linux/device.h> #include <linux/fault-inject.h> -#include <linux/wakelock.h> #include <linux/mmc/core.h> #include <linux/mmc/pm.h> @@ -330,7 +329,6 @@ struct mmc_host { int claim_cnt; /* "claim" nesting count */ struct delayed_work detect; - struct wake_lock detect_wake_lock; int detect_change; /* card detect flag */ struct mmc_slot slot; diff --git a/include/linux/sched.h b/include/linux/sched.h index 22913f78b829..67f59c1e0c7b 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1297,6 +1297,7 @@ struct task_struct { cputime_t utime, stime, utimescaled, stimescaled; cputime_t gtime; + unsigned long long cpu_power; #ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE struct cputime prev_cputime; #endif |