From: Huaisheng Ye <yehs1@xxxxxxxxxx> GFP_HIGHUSER_MOVABLE doesn't equal to GFP_HIGHUSER | __GFP_MOVABLE, modify it to adapt patch of getting rid of GFP_ZONE_TABLE/BAD. Signed-off-by: Huaisheng Ye <yehs1@xxxxxxxxxx> Cc: Kate Stewart <kstewart@xxxxxxxxxxxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Philippe Ombredanne <pombredanne@xxxxxxxx> --- include/linux/highmem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 776f90f..da34260 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -159,8 +159,8 @@ static inline void clear_user_highpage(struct page *page, unsigned long vaddr) struct vm_area_struct *vma, unsigned long vaddr) { - struct page *page = alloc_page_vma(GFP_HIGHUSER | movableflags, - vma, vaddr); + struct page *page = alloc_page_vma(movableflags ? + GFP_HIGHUSER_MOVABLE : GFP_HIGHUSER, vma, vaddr); if (page) clear_user_highpage(page, vaddr); -- 1.8.3.1