diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 16:00:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 16:00:39 +1100 |
| commit | 97481cb6a44e877579b686e92e8f89fb8588b76e (patch) | |
| tree | 76094d084d924ea191110926fac7bcc16b5af267 /init | |
| parent | 1bf277bdb1cd998bd02c9a5b457c3b211086d961 (diff) | |
| parent | 6a254c0c7bdfa26245777bee5d63cdfa6bba1ff5 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/x86/kernel/acpi/sleep.c
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 3da09dab5378..8fe6f268de12 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -683,6 +683,16 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED select this option (if, for some reason, they need to disable it then noswapaccount does the trick). +config CGROUP_PERF + bool "Enable perf_event per-cpu per-container group (cgroup) monitoring" + depends on PERF_EVENTS && CGROUPS + help + This option extends the per-cpu mode to restrict monitoring to + threads which belong to the cgroup specificied and run on the + designated cpu. + + Say N if unsure. + menuconfig CGROUP_SCHED bool "Group CPU scheduler" depends on EXPERIMENTAL |