diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-09-26 02:31:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:48:50 -0400 |
commit | 9b819d204cf602eab1a53a9ec4b8d2ca51e02a1d (patch) | |
tree | 9442bf01a00a93a8ae54462fb4878588e1b2a6bf /mm/mempolicy.c | |
parent | 056c62418cc639bf2fe962c6a6ee56054b838bc7 (diff) |
[PATCH] Add __GFP_THISNODE to avoid fallback to other nodes and ignore cpuset/memory policy restrictions
Add a new gfp flag __GFP_THISNODE to avoid fallback to other nodes. This
flag is essential if a kernel component requires memory to be located on a
certain node. It will be needed for alloc_pages_node() to force allocation
on the indicated node and for alloc_pages() to force allocation on the
current node.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/mempolicy.c')
-rw-r--r-- | mm/mempolicy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index c3429a710ab1..8002e1faccda 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
@@ -1290,7 +1290,7 @@ struct page *alloc_pages_current(gfp_t gfp, unsigned order) | |||
1290 | 1290 | ||
1291 | if ((gfp & __GFP_WAIT) && !in_interrupt()) | 1291 | if ((gfp & __GFP_WAIT) && !in_interrupt()) |
1292 | cpuset_update_task_memory_state(); | 1292 | cpuset_update_task_memory_state(); |
1293 | if (!pol || in_interrupt()) | 1293 | if (!pol || in_interrupt() || (gfp & __GFP_THISNODE)) |
1294 | pol = &default_policy; | 1294 | pol = &default_policy; |
1295 | if (pol->policy == MPOL_INTERLEAVE) | 1295 | if (pol->policy == MPOL_INTERLEAVE) |
1296 | return alloc_page_interleave(gfp, order, interleave_nodes(pol)); | 1296 | return alloc_page_interleave(gfp, order, interleave_nodes(pol)); |