From patchwork Thu Aug 17 14:44:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9906515 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AC7BF6038C for ; Thu, 17 Aug 2017 14:49:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E52B28B3B for ; Thu, 17 Aug 2017 14:49:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9370728B41; Thu, 17 Aug 2017 14:49:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6102228B3B for ; Thu, 17 Aug 2017 14:49:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1diM55-0002k1-J3; Thu, 17 Aug 2017 14:47:31 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1diM54-0002iD-En for xen-devel@lists.xenproject.org; Thu, 17 Aug 2017 14:47:30 +0000 Received: from [193.109.254.147] by server-11.bemta-6.messagelabs.com id 18/19-03612-18CA5995; Thu, 17 Aug 2017 14:47:29 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHSDvW7jmqm RBtcniFl83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBlX7m1lL2jmrFh8nr+B8RlbFyMnh4SAv0TL 55uMIDabgLLEz85esLiIgJ5E04HnQHEuDmaBOYwSU+d2gRUJC0RInJp1AsxmEVCVWHxoITuIz StgKXH03EpWiKHyErvaLoLZnEDxQ5MWM4PYQgIWErM/tLND2AoSHdOPMUH0CkqcnPmEBcRmFp CQOPjiBfMERt5ZSFKzkKQWMDKtYtQoTi0qSy3SNTLTSyrKTM8oyU3MzNE1NDDTy00tLk5MT81 JTCrWS87P3cQIDB4GINjBeGZB4CFGSQ4mJVHe37OmRArxJeWnVGYkFmfEF5XmpBYfYpTh4FCS 4C1cPTVSSLAoNT21Ii0zBxjGMGkJDh4lEd7/q4DSvMUFibnFmekQqVOMuhyvJvz/xiTEkpefl yolzhsNUiQAUpRRmgc3AhZTlxhlpYR5GYGOEuIpSC3KzSxBlX/FKM7BqCTM6wtyCU9mXgncpl dARzABHXGlfRLIESWJCCmpBka/ZeK3hc7ee/15slq3/vGUxg1hx5dprdJ5Fbz/69OqDM2MmZZ 3VnoleBQ+L3yU+vfzTpPCetWwDdtXp1zx0jRgWM9+6+Xq/GmFzU2SvWKMco2mMgmnunbMDllk HuBncebQ660FkrsOdvyevtl3/2R+Zru7H5gnCAtuj9EP5l/Z8OJLUdXZreuVWIozEg21mIuKE wG2FLilpAIAAA== X-Env-Sender: prvs=395e6b081=wei.liu2@citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1502981245!112361240!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 41879 invoked from network); 17 Aug 2017 14:47:29 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 17 Aug 2017 14:47:29 -0000 X-IronPort-AV: E=Sophos;i="5.41,388,1498521600"; d="scan'208";a="444178816" From: Wei Liu To: Xen-devel Date: Thu, 17 Aug 2017 15:44:55 +0100 Message-ID: <20170817144456.18989-31-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170817144456.18989-1-wei.liu2@citrix.com> References: <20170817144456.18989-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: George Dunlap , Andrew Cooper , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH v4 30/31] x86/mm: use put_page_type_preemptible in put_page_from_l{2, 3}e X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP No functional change. Signed-off-by: Wei Liu --- xen/arch/x86/mm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index c2a73f123f..70559c687c 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1046,8 +1046,6 @@ int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn) return 0; } -static int __put_page_type(struct page_info *, int preemptible); - int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn, int partial, bool defer) { @@ -1074,7 +1072,7 @@ int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn, int partial, if ( unlikely(partial > 0) ) { ASSERT(!defer); - return __put_page_type(pg, 1); + return put_page_type_preemptible(pg); } if ( defer ) @@ -1097,7 +1095,7 @@ int put_page_from_l4e(l4_pgentry_t l4e, unsigned long pfn, int partial, if ( unlikely(partial > 0) ) { ASSERT(!defer); - return __put_page_type(pg, 1); + return put_page_type_preemptible(pg); } if ( defer )