aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-09-02 20:20:58 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-09-02 20:20:58 -0700
commitcd7e4a91db4ea690f58420671e21153452236aeb (patch)
treeffad81cde1a8e307140e58e348413317d39f28d3 /mm
parent3e9e3e717f87884ad3dfb1462443d2792c2e70bf (diff)
downloadhistory-cd7e4a91db4ea690f58420671e21153452236aeb.tar.gz
[PATCH] add_to_swap(): suppress oom message
Page allocation failures are expected when add_to_swap() tries to allocate radix-tree nodes without PF_MEMALLOC. Kill the __alloc_pages() warnings. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/swap_state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/swap_state.c b/mm/swap_state.c
index 5717135766d9d5..6e81f2d52edc6a 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -171,7 +171,7 @@ int add_to_swap(struct page * page)
/*
* Add it to the swap cache and mark it dirty
*/
- err = __add_to_swap_cache(page, entry, GFP_ATOMIC);
+ err = __add_to_swap_cache(page, entry, GFP_ATOMIC|__GFP_NOWARN);
if (pf_flags & PF_MEMALLOC)
current->flags |= PF_MEMALLOC;