diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-30 10:44:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-30 10:44:27 +0200 |
| commit | 536e0e81e0b04305ce40f6cc4299d29dc9bbc673 (patch) | |
| tree | 1cb7f695bc220bb9cdc5cb9ed1ef005f7771b1fd /mm/ksm.c | |
| parent | c1fad9ef7ed14aad464972e6444e7a3bd5670f26 (diff) | |
| parent | 53061afee43bc5041b67a45b6d793e7afdcf9ca7 (diff) | |
| download | lwn-536e0e81e0b04305ce40f6cc4299d29dc9bbc673.tar.gz lwn-536e0e81e0b04305ce40f6cc4299d29dc9bbc673.zip | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/ksm.c')
| -rw-r--r-- | mm/ksm.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -283,7 +283,8 @@ static inline struct rmap_item *alloc_rmap_item(void) { 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; |