summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-09-25 23:31:46 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-26 08:48:50 -0700
commit980128f223fa3c75e3ebdde650c9f1bcabd4c0a2 (patch)
treeb0fa592cf621cebc674b9ec1a4ab4e2558ec7aaf /arch
parentfbd98167e653535c5816be154f2149c0efa7757d (diff)
downloadblackbird-op-linux-980128f223fa3c75e3ebdde650c9f1bcabd4c0a2.tar.gz
blackbird-op-linux-980128f223fa3c75e3ebdde650c9f1bcabd4c0a2.zip
[PATCH] Define easier to handle GFP_THISNODE
In many places we will need to use the same combination of flags. Specify a single GFP_THISNODE definition for ease of use in gfp.h. Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/kernel/uncached.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c
index f813caa80570..c58e933694d5 100644
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
@@ -98,8 +98,7 @@ static int uncached_add_chunk(struct uncached_pool *uc_pool, int nid)
/* attempt to allocate a granule's worth of cached memory pages */
- page = alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO |
- __GFP_THISNODE | __GFP_NORETRY | __GFP_NOWARN,
+ page = alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,
IA64_GRANULE_SHIFT-PAGE_SHIFT);
if (!page) {
mutex_unlock(&uc_pool->add_chunk_mutex);
OpenPOWER on IntegriCloud