projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
memcg: kmem accounting basic infrastructure
[cascardo/linux.git]
/
init
/
Kconfig
diff --git
a/init/Kconfig
b/init/Kconfig
index
1a207ef
..
19ccb33
100644
(file)
--- a/
init/Kconfig
+++ b/
init/Kconfig
@@
-882,6
+882,7
@@
config MEMCG_SWAP_ENABLED
config MEMCG_KMEM
bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)"
depends on MEMCG && EXPERIMENTAL
config MEMCG_KMEM
bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)"
depends on MEMCG && EXPERIMENTAL
+ depends on SLUB || SLAB
default n
help
The Kernel Memory extension for Memory Resource Controller can limit
default n
help
The Kernel Memory extension for Memory Resource Controller can limit
@@
-1069,11
+1070,9
@@
config UIDGID_CONVERTED
# Filesystems
depends on 9P_FS = n
depends on AFS_FS = n
# Filesystems
depends on 9P_FS = n
depends on AFS_FS = n
- depends on AUTOFS4_FS = n
depends on CEPH_FS = n
depends on CIFS = n
depends on CODA_FS = n
depends on CEPH_FS = n
depends on CIFS = n
depends on CODA_FS = n
- depends on FUSE_FS = n
depends on GFS2_FS = n
depends on NCP_FS = n
depends on NFSD = n
depends on GFS2_FS = n
depends on NCP_FS = n
depends on NFSD = n