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
ARM: OMAP3: PM: remove access to PRM_VOLTCTRL register
[pandora-kernel.git]
/
mm
/
page_cgroup.c
diff --git
a/mm/page_cgroup.c
b/mm/page_cgroup.c
index
6bdc67d
..
2d123f9
100644
(file)
--- a/
mm/page_cgroup.c
+++ b/
mm/page_cgroup.c
@@
-133,10
+133,13
@@
struct page *lookup_cgroup_page(struct page_cgroup *pc)
static void *__meminit alloc_page_cgroup(size_t size, int nid)
{
void *addr = NULL;
static void *__meminit alloc_page_cgroup(size_t size, int nid)
{
void *addr = NULL;
+ gfp_t flags = GFP_KERNEL | __GFP_NOWARN;
- addr = alloc_pages_exact_nid(nid, size, GFP_KERNEL | __GFP_NOWARN);
- if (addr)
+ addr = alloc_pages_exact_nid(nid, size, flags);
+ if (addr) {
+ kmemleak_alloc(addr, size, 1, flags);
return addr;
return addr;
+ }
if (node_state(nid, N_HIGH_MEMORY))
addr = vmalloc_node(size, nid);
if (node_state(nid, N_HIGH_MEMORY))
addr = vmalloc_node(size, nid);
@@
-357,7
+360,7
@@
struct swap_cgroup_ctrl {
spinlock_t lock;
};
spinlock_t lock;
};
-struct swap_cgroup_ctrl swap_cgroup_ctrl[MAX_SWAPFILES];
+st
atic st
ruct swap_cgroup_ctrl swap_cgroup_ctrl[MAX_SWAPFILES];
struct swap_cgroup {
unsigned short id;
struct swap_cgroup {
unsigned short id;