diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-06-04 12:20:54 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2015-06-04 12:52:49 +0530 |
| commit | b6eece95acfd54963a69c18845aee2a3c593e699 (patch) | |
| tree | a6810c8b6ddbbbc05990c5c686bc2c238ade76e7 /include | |
| parent | bf3015849c3e9e7befda3f877e7646756b5925ee (diff) | |
| parent | f6952f325beb255cb947a5cf9e5e6c4a9e0afa15 (diff) | |
Merge branch 'android-3.14' of https://android.googlesource.com/kernel/common
* android-3.14:
uid_cputime: Extends the cputime functionality to report power per uid
sched: cpufreq: Adds a field cpu_power in the task_struct
cpufreq_stats: Adds the fucntionality to load current values for each frequency for all the cores.
New Build Breakage in branch: kernel-m-dev-tegra-flounder-3.10 @ 1960706
net/unix: sk_socket can disappear when state is unlocked
selinux: enable genfscon labeling for sysfs and pstore files
ext4: don't save the error information if the block device is read-only
selinux: enable per-file labeling for debugfs files.
cpufreq: interactive: Rearm governor timer at max freq
cpufreq: interactive: Implement cluster-based min_sample_time
cpufreq: interactive: Exercise hispeed settings at a policy level
suspend: Return error when pending wakeup source is found.
proc: uid_cputime: fix show_uid_stat permission
nf: IDLETIMER: Fix broken uid field in the msg
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Conflicts:
drivers/cpufreq/cpufreq_stats.c
diff --cc drivers/cpufreq/cpufreq_stats.c
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@@ -14,7 -14,8 +14,12 @@@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/sort.h>
++<<<<<<< HEAD
+#include <linux/err.h>
++=======
+ #include <linux/of.h>
+ #include <linux/sched.h>
++>>>>>>> aosp/android-3.14
#include <asm/cputime.h>
We carry forwarded an android-3.10 commit 40cf2f818f45:
(cpufreq: Persist cpufreq time in state data across hotplug)
to linaro/experimental/android-3.14 tree when aosp/android-3.14
was no where to be seen in the picture. This commit landed in
aosp/android-3.14 with a minor (conflicting) change, commit 6ecf10bfc5f4.
Resolution:
drop the include carry forwarded from android-3.10
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpufreq.h | 8 | ||||
| -rw-r--r-- | include/linux/sched.h | 1 |
2 files changed, 9 insertions, 0 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/sched.h b/include/linux/sched.h index 37658d063909..6aef9c64c73d 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1290,6 +1290,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 |