From: Andrew Morton Missing \ Cc: Mel Gorman Signed-off-by: Andrew Morton --- include/asm-ia64/page.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff -puN include/asm-ia64/page.h~add-__gfp_movable-for-callers-to-flag-allocations-from-high-memory-that-may-be-migrated-fix include/asm-ia64/page.h --- a/include/asm-ia64/page.h~add-__gfp_movable-for-callers-to-flag-allocations-from-high-memory-that-may-be-migrated-fix +++ a/include/asm-ia64/page.h @@ -87,13 +87,13 @@ do { \ } while (0) -#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \ -({ \ - struct page *page = alloc_page_vma( - GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr); \ - if (page) \ - flush_dcache_page(page); \ - page; \ +#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \ +({ \ + struct page *page = alloc_page_vma( \ + GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr); \ + if (page) \ + flush_dcache_page(page); \ + page; \ }) #define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE _