git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
mm
/
page_cgroup.c
diff --git
a/mm/page_cgroup.c
b/mm/page_cgroup.c
index
eb750f8
..
5ddad0c
100644
(file)
--- a/
mm/page_cgroup.c
+++ b/
mm/page_cgroup.c
@@
-317,7
+317,7
@@
void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat)
#endif
#endif
-#ifdef CONFIG_
CGROUP_MEM_RES_CTLR
_SWAP
+#ifdef CONFIG_
MEMCG
_SWAP
static DEFINE_MUTEX(swap_cgroup_mutex);
struct swap_cgroup_ctrl {
static DEFINE_MUTEX(swap_cgroup_mutex);
struct swap_cgroup_ctrl {