From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 6229D6B026C for ; Wed, 23 May 2018 13:14:12 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id s3-v6so13494184pfh.0 for ; Wed, 23 May 2018 10:14:12 -0700 (PDT) Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id f8-v6sor4810852pgu.7.2018.05.23.10.14.11 for (Google Transport Security); Wed, 23 May 2018 10:14:11 -0700 (PDT) From: Huaisheng Ye Subject: [RFC PATCH v3 9/9] arch/x86/include/asm/page.h: update usage of movableflags Date: Thu, 24 May 2018 01:13:41 +0800 Message-Id: <1527095621-5574-1-git-send-email-yehs2007@gmail.com> Sender: owner-linux-mm@kvack.org List-ID: To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: mhocko@suse.com, willy@infradead.org, hch@lst.de, vbabka@suse.cz, mgorman@techsingularity.net, kstewart@linuxfoundation.org, gregkh@linuxfoundation.org, colyli@suse.de, chengnt@lenovo.com, hehy1@lenovo.com, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-btrfs@vger.kernel.org, Huaisheng Ye , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , "x86@kernel.org" , Philippe Ombredanne , Christoph Hellwig From: Huaisheng Ye 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 Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Kate Stewart Cc: Greg Kroah-Hartman Cc: x86@kernel.org Cc: Philippe Ombredanne Cc: Christoph Hellwig --- arch/x86/include/asm/page.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h index 7555b48..a47f42d 100644 --- a/arch/x86/include/asm/page.h +++ b/arch/x86/include/asm/page.h @@ -35,7 +35,8 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr, } #define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \ - alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr) + alloc_page_vma((movableflags ? GFP_HIGHUSER_MOVABLE : GFP_HIGHUSER) \ + | __GFP_ZERO, vma, vaddr) #define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE #ifndef __pa -- 1.8.3.1