diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 21:31:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 21:31:30 -0400 |
| commit | a926021cb1f8a99a275eaf6eb546102e9469dc59 (patch) | |
| tree | c6d0300cd4b1a1fd658708476db4577b68b4de31 /init | |
| parent | 0586bed3e8563c2eb89bc7256e30ce633ae06cfb (diff) | |
| parent | 5e814dd597c42daeb8d2a276e64a6ec986ad0e2a (diff) | |
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (184 commits)
perf probe: Clean up probe_point_lazy_walker() return value
tracing: Fix irqoff selftest expanding max buffer
tracing: Align 4 byte ints together in struct tracer
tracing: Export trace_set_clr_event()
tracing: Explain about unstable clock on resume with ring buffer warning
ftrace/graph: Trace function entry before updating index
ftrace: Add .ref.text as one of the safe areas to trace
tracing: Adjust conditional expression latency formatting.
tracing: Fix event alignment: skb:kfree_skb
tracing: Fix event alignment: mce:mce_record
tracing: Fix event alignment: kvm:kvm_hv_hypercall
tracing: Fix event alignment: module:module_request
tracing: Fix event alignment: ftrace:context_switch and ftrace:wakeup
tracing: Remove lock_depth from event entry
perf header: Stop using 'self'
perf session: Use evlist/evsel for managing perf.data attributes
perf top: Don't let events to eat up whole header line
perf top: Fix events overflow in top command
ring-buffer: Remove unused #include <linux/trace_irq.h>
tracing: Add an 'overwrite' trace_option.
...
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 e72fa17fe559..5721d27af626 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -695,6 +695,16 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED | |||
| 695 | select this option (if, for some reason, they need to disable it | 695 | select this option (if, for some reason, they need to disable it |
| 696 | then noswapaccount does the trick). | 696 | then noswapaccount does the trick). |
| 697 | 697 | ||
| 698 | config CGROUP_PERF | ||
| 699 | bool "Enable perf_event per-cpu per-container group (cgroup) monitoring" | ||
| 700 | depends on PERF_EVENTS && CGROUPS | ||
| 701 | help | ||
| 702 | This option extends the per-cpu mode to restrict monitoring to | ||
| 703 | threads which belong to the cgroup specified and run on the | ||
| 704 | designated cpu. | ||
| 705 | |||
| 706 | Say N if unsure. | ||
| 707 | |||
| 698 | menuconfig CGROUP_SCHED | 708 | menuconfig CGROUP_SCHED |
| 699 | bool "Group CPU scheduler" | 709 | bool "Group CPU scheduler" |
| 700 | depends on EXPERIMENTAL | 710 | depends on EXPERIMENTAL |