projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: phy: dp83848: add dp83822 PHY support
[cascardo/linux.git]
/
mm
/
list_lru.c
diff --git
a/mm/list_lru.c
b/mm/list_lru.c
index
afc71ea
..
1d05cb9
100644
(file)
--- a/
mm/list_lru.c
+++ b/
mm/list_lru.c
@@
-12,7
+12,7
@@
#include <linux/mutex.h>
#include <linux/memcontrol.h>
#include <linux/mutex.h>
#include <linux/memcontrol.h>
-#if
def CONFIG_MEMCG_KMEM
+#if
defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
static LIST_HEAD(list_lrus);
static DEFINE_MUTEX(list_lrus_mutex);
static LIST_HEAD(list_lrus);
static DEFINE_MUTEX(list_lrus_mutex);
@@
-37,9
+37,9
@@
static void list_lru_register(struct list_lru *lru)
static void list_lru_unregister(struct list_lru *lru)
{
}
static void list_lru_unregister(struct list_lru *lru)
{
}
-#endif /* CONFIG_MEMCG
_KMEM
*/
+#endif /* CONFIG_MEMCG
&& !CONFIG_SLOB
*/
-#if
def CONFIG_MEMCG_KMEM
+#if
defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
static inline bool list_lru_memcg_aware(struct list_lru *lru)
{
/*
static inline bool list_lru_memcg_aware(struct list_lru *lru)
{
/*
@@
-104,7
+104,7
@@
list_lru_from_kmem(struct list_lru_node *nlru, void *ptr)
{
return &nlru->lru;
}
{
return &nlru->lru;
}
-#endif /* CONFIG_MEMCG
_KMEM
*/
+#endif /* CONFIG_MEMCG
&& !CONFIG_SLOB
*/
bool list_lru_add(struct list_lru *lru, struct list_head *item)
{
bool list_lru_add(struct list_lru *lru, struct list_head *item)
{
@@
-292,7
+292,7
@@
static void init_one_lru(struct list_lru_one *l)
l->nr_items = 0;
}
l->nr_items = 0;
}
-#if
def CONFIG_MEMCG_KMEM
+#if
defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
static void __memcg_destroy_list_lru_node(struct list_lru_memcg *memcg_lrus,
int begin, int end)
{
static void __memcg_destroy_list_lru_node(struct list_lru_memcg *memcg_lrus,
int begin, int end)
{
@@
-529,7
+529,7
@@
static int memcg_init_list_lru(struct list_lru *lru, bool memcg_aware)
static void memcg_destroy_list_lru(struct list_lru *lru)
{
}
static void memcg_destroy_list_lru(struct list_lru *lru)
{
}
-#endif /* CONFIG_MEMCG
_KMEM
*/
+#endif /* CONFIG_MEMCG
&& !CONFIG_SLOB
*/
int __list_lru_init(struct list_lru *lru, bool memcg_aware,
struct lock_class_key *key)
int __list_lru_init(struct list_lru *lru, bool memcg_aware,
struct lock_class_key *key)