projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
[cascardo/linux.git]
/
include
/
linux
/
list_lru.h
diff --git
a/include/linux/list_lru.h
b/include/linux/list_lru.h
index
2a6b994
..
cb0ba9f
100644
(file)
--- a/
include/linux/list_lru.h
+++ b/
include/linux/list_lru.h
@@
-40,7
+40,7
@@
struct list_lru_node {
spinlock_t lock;
/* global list, used for the root cgroup in cgroup aware lrus */
struct list_lru_one lru;
spinlock_t lock;
/* global list, used for the root cgroup in cgroup aware lrus */
struct list_lru_one lru;
-#if
def CONFIG_MEMCG_KMEM
+#if
defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
/* for cgroup aware lrus points to per cgroup lists, otherwise NULL */
struct list_lru_memcg *memcg_lrus;
#endif
/* for cgroup aware lrus points to per cgroup lists, otherwise NULL */
struct list_lru_memcg *memcg_lrus;
#endif
@@
-48,7
+48,7
@@
struct list_lru_node {
struct list_lru {
struct list_lru_node *node;
struct list_lru {
struct list_lru_node *node;
-#if
def CONFIG_MEMCG_KMEM
+#if
defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
struct list_head list;
#endif
};
struct list_head list;
#endif
};