diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-22 07:40:23 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-22 07:40:22 -0700 |
| commit | 4dcf7a50c50fa8d71a7a3f494950d0b15bdc5c11 (patch) | |
| tree | 0fb7cf7429c31d8022985abe6abb051bb9679a30 /drivers/misc | |
| parent | a367cb43e424076820fa5dc09d45f794d3d84837 (diff) | |
| parent | c5f247dd6d415e5f4b7613d0234a311b81354ee9 (diff) | |
Merge "Merge branch 'android-4.4@6fc0573' into branch 'msm-4.4'"
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 2a4abf736d89..d86795bf9453 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -551,7 +551,7 @@ config VEXPRESS_SYSCFG config UID_SYS_STATS bool "Per-UID statistics" - depends on PROFILING + depends on PROFILING && TASK_XACCT && TASK_IO_ACCOUNTING help Per UID based cpu time statistics exported to /proc/uid_cputime Per UID based io statistics exported to /proc/uid_io |