Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1958 commits) net: pack skb_shared_info more efficiently net_sched: red: split red_parms into parms and vars net_sched: sfq: extend limits cnic: Improve error recovery on bnx2x devices cnic: Re-init dev->stats_addr after chip reset net_sched: Bug in netem reordering bna: fix sparse warnings/errors bna: make ethtool_ops and strings const xgmac: cleanups net: make ethtool_ops const vmxnet3" make ethtool ops const xen-netback: make ops structs const virtio_net: Pass gfp flags when allocating rx buffers. ixgbe: FCoE: Add support for ndo_get_fcoe_hbainfo() call netdev: FCoE: Add new ndo_get_fcoe_hbainfo() call igb: reset PHY after recovering from PHY power down igb: add basic runtime PM support igb: Add support for byte queue limits. e1000: cleanup CE4100 MDIO registers access e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove ...
author: Linus Torvalds <torvalds@linux-foundation.org> 2012-01-06 20:22:09 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2012-01-06 20:22:09 -0500
commit: 9753dfe19a85e7e45a34a56f4cb2048bb4f50e27 (patch)
tree: c017a1b4a70b8447c71b01d8b320e071546b5c9d /init
parent: edf7c8148ec40c0fd27c0ef3f688defcc65e3913 (diff)
parent: 9f42f126154786e6e76df513004800c8c633f020 (diff)
1 files changed, 11 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 82b6a4c675b2..a075765d5fbe 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -689,6 +689,17 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
          For those who want to have the feature enabled by default should
          select this option (if, for some reason, they need to disable it
          then swapaccount=0 does the trick).
+config CGROUP_MEM_RES_CTLR_KMEM
+        bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)"
+        depends on CGROUP_MEM_RES_CTLR && EXPERIMENTAL
+        default n
+        help
+          The Kernel Memory extension for Memory Resource Controller can limit
+          the amount of memory used by kernel objects in the system. Those are
+          fundamentally different from the entities handled by the standard
+          Memory Controller, which are page-based, and can be swapped. Users of
+          the kmem extension can use it to guarantee that no group of processes
+          will ever exhaust kernel resources alone.
 config CGROUP_PERF
        bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
author	Linus Torvalds <torvalds@linux-foundation.org>	2012-01-06 20:22:09 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2012-01-06 20:22:09 -0500
commit	9753dfe19a85e7e45a34a56f4cb2048bb4f50e27 (patch)
tree	c017a1b4a70b8447c71b01d8b320e071546b5c9d /init
parent	edf7c8148ec40c0fd27c0ef3f688defcc65e3913 (diff)
parent	9f42f126154786e6e76df513004800c8c633f020 (diff)

diff --git a/init/Kconfig b/init/Kconfig index 82b6a4c675b2..a075765d5fbe 100644 --- a/init/Kconfig +++ b/init/Kconfig
@@ -689,6 +689,17 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
689	For those who want to have the feature enabled by default should	689	For those who want to have the feature enabled by default should
690	select this option (if, for some reason, they need to disable it	690	select this option (if, for some reason, they need to disable it
691	then swapaccount=0 does the trick).	691	then swapaccount=0 does the trick).
		692	config CGROUP_MEM_RES_CTLR_KMEM
		693	bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)"
		694	depends on CGROUP_MEM_RES_CTLR && EXPERIMENTAL
		695	default n
		696	help
		697	The Kernel Memory extension for Memory Resource Controller can limit
		698	the amount of memory used by kernel objects in the system. Those are
		699	fundamentally different from the entities handled by the standard
		700	Memory Controller, which are page-based, and can be swapped. Users of
		701	the kmem extension can use it to guarantee that no group of processes
		702	will ever exhaust kernel resources alone.
692		703
693	config CGROUP_PERF	704	config CGROUP_PERF
694	bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"	705	bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"