From: Christoph Lameter 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 Signed-off-by: Andrew Morton --- arch/ia64/kernel/uncached.c | 3 +-- include/linux/gfp.h | 2 ++ mm/migrate.c | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff -puN arch/ia64/kernel/uncached.c~define-easier-to-handle-gfp_thisnode arch/ia64/kernel/uncached.c --- a/arch/ia64/kernel/uncached.c~define-easier-to-handle-gfp_thisnode +++ a/arch/ia64/kernel/uncached.c @@ -98,8 +98,7 @@ static int uncached_add_chunk(struct unc /* 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); diff -puN include/linux/gfp.h~define-easier-to-handle-gfp_thisnode include/linux/gfp.h --- a/include/linux/gfp.h~define-easier-to-handle-gfp_thisnode +++ a/include/linux/gfp.h @@ -67,6 +67,8 @@ struct vm_area_struct; #define GFP_HIGHUSER (__GFP_WAIT | __GFP_IO | __GFP_FS | __GFP_HARDWALL | \ __GFP_HIGHMEM) +#define GFP_THISNODE (__GFP_THISNODE | __GFP_NOWARN | __GFP_NORETRY) + /* Flag - indicates that the buffer will be suitable for DMA. Ignored on some platforms, used as appropriate on others */ diff -puN mm/migrate.c~define-easier-to-handle-gfp_thisnode mm/migrate.c --- a/mm/migrate.c~define-easier-to-handle-gfp_thisnode +++ a/mm/migrate.c @@ -748,9 +748,7 @@ static struct page *new_page_node(struct *result = &pm->status; - return alloc_pages_node(pm->node, - GFP_HIGHUSER | __GFP_THISNODE | __GFP_NOWARN | __GFP_NORETRY, - 0); + return alloc_pages_node(pm->node, GFP_HIGHUSER | GFP_THISNODE, 0); } /* _