projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
mm
/
ksm.c
diff --git
a/mm/ksm.c
b/mm/ksm.c
index
73d43ba
..
5048083
100644
(file)
--- a/
mm/ksm.c
+++ b/
mm/ksm.c
@@
-283,7
+283,8
@@
static inline struct rmap_item *alloc_rmap_item(void)
{
struct rmap_item *rmap_item;
{
struct rmap_item *rmap_item;
- rmap_item = kmem_cache_zalloc(rmap_item_cache, GFP_KERNEL);
+ rmap_item = kmem_cache_zalloc(rmap_item_cache, GFP_KERNEL |
+ __GFP_NORETRY | __GFP_NOWARN);
if (rmap_item)
ksm_rmap_items++;
return rmap_item;
if (rmap_item)
ksm_rmap_items++;
return rmap_item;