From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933744AbeEWPRI (ORCPT ); Wed, 23 May 2018 11:17:08 -0400 Received: from m50-134.163.com ([123.125.50.134]:60917 "EHLO m50-134.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933527AbeEWPRC (ORCPT ); Wed, 23 May 2018 11:17:02 -0400 From: Huaisheng Ye 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 Subject: [RFC PATCH v3 9/9] arch/x86/include/asm/page.h: update usage of movableflags Date: Wed, 23 May 2018 22:57:54 +0800 Message-Id: <1527087474-93986-10-git-send-email-yehs2007@163.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1527087474-93986-1-git-send-email-yehs2007@163.com> References: <1527087474-93986-1-git-send-email-yehs2007@163.com> X-CM-TRANSID: DtGowAAXEWSIgQVbCQ9NAA--.108S11 X-Coremail-Antispam: 1Uf129KBjvJXoW7try8AryDGrWUCrW8ZFyxKrg_yoW8Jw1DpF ZrCw1kWFsxGrySka4vyFn7uFyxua17CF43tFy7Ww1UZa4YqF1qqrWvgas0v3sF9F48tan5 AFZFg3W0y3W8ZaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07b23ktUUUUU= X-Originating-IP: [103.244.59.4] X-CM-SenderInfo: p1hk2jqqqxqiywtou0bp/1tbi8BdPT1UMEBai-AAAsm Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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