ceph: avoid null deref in osd request error path

[net-next-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 24932b9c03e8c38649647aa72a166dc7bb509b63..2de5b1cbadd9e47138f879d23cc4d2d5066d32d7 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -577,8 +577,8 @@ config CGROUP_MEM_RES_CTLR
          could in turn add some fork/exit overhead.
 
 config CGROUP_MEM_RES_CTLR_SWAP
-       bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)"
-       depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL
+       bool "Memory Resource Controller Swap Extension"
+       depends on CGROUP_MEM_RES_CTLR && SWAP
        help
          Add swap management feature to memory resource controller. When you
          enable this, you can limit mem+swap usage per cgroup. In other words,