From patchwork Wed Jun 7 12:04:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Punit Agrawal X-Patchwork-Id: 9771417 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 8B23C60350 for ; Wed, 7 Jun 2017 12:07:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59FDB24B44 for ; Wed, 7 Jun 2017 12:07:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EB25283DA; Wed, 7 Jun 2017 12:07:20 +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 BA3BC24B44 for ; Wed, 7 Jun 2017 12:07:19 +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 1dIZi2-0001ys-Mp; Wed, 07 Jun 2017 12:05:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIZi1-0001yj-3e for xen-devel@lists.xen.org; Wed, 07 Jun 2017 12:05:09 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id BA/7A-10689-4FBE7395; Wed, 07 Jun 2017 12:05:08 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRWlGSWpSXmKPExsVysyfVTffza/N Ig5nXtS2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oxjG28yFTSwV3z9KN/AuIW1i5GLQ0hgI6PE uhftjBDOdkaJg++2sncxcnKwCWhLTP09kRnEFhGQlrj2+TJYEbNAA5NE07RuRpCEsICfxPGXm 1lBbBYBVYl/uzaBxXkFrCQ6Pi5jArElBOQldrVdBKvhFLCWuD5hO9hQIaCavoPPWSFqJCX2nP zOOIGRZwEjwypG9eLUorLUIl0zvaSizPSMktzEzBxdQwNjvdzU4uLE9NScxKRiveT83E2MQL/ XMzAw7mC80uZ8iFGSg0lJlLfgpnmkEF9SfkplRmJxRnxRaU5q8SFGGQ4OJQneA6+AcoJFqemp FWmZOcAAhElLcPAoifDeeQGU5i0uSMwtzkyHSJ1i1OVo+rDlC5MQS15+XqqUOO9JkBkCIEUZp XlwI2DRcIlRVkqYl5GBgUGIpyC1KDezBFX+FaM4B6OSMO80kCk8mXklcJteAR3BBHQE3yUTkC NKEhFSUg2MYa+k/srbrczawO/Qf+wSq9qFBeeX8P3keJqjaq1xRCbBasKmX0d83nDf9S+fx2+ Z9lD0CtOG1k92T+bf1f8gMf/1tOWmAm3ni27Y/OxVm8PCVDude6eO2MIy1WibppMMyRciigTe yeyQfTRzQ9Tadq5Jn79s3BT3yUJMUPKpw0YTFo+NKZdrlViKMxINtZiLihMB2m4hq4ECAAA= X-Env-Sender: punit.agrawal@arm.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1496837107!96941562!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 34849 invoked from network); 7 Jun 2017 12:05:07 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-7.tower-31.messagelabs.com with SMTP; 7 Jun 2017 12:05:07 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B0FF32B; Wed, 7 Jun 2017 05:05:06 -0700 (PDT) Received: from localhost (e105922-lin.cambridge.arm.com [10.1.207.56]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7FB253F557; Wed, 7 Jun 2017 05:05:06 -0700 (PDT) From: Punit Agrawal To: xen-devel@lists.xen.org Date: Wed, 7 Jun 2017 13:04:10 +0100 Message-Id: <20170607120410.14552-1-punit.agrawal@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170526111407.13537-4-punit.agrawal@arm.com> References: <20170526111407.13537-4-punit.agrawal@arm.com> X-ARM-No-Footer: FoSSMail Cc: sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, Punit Agrawal , tim@xen.org, julien.grall@arm.com, jbeulich@suse.com, ian.jackson@eu.citrix.com Subject: [Xen-devel] [For Xen-4.10 PATCH] memory: Re-introduce an erroneously dropped line 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit 726b737574 makes an unrelated change deleting a line setting the page from mfn. Although the page variable is not used, it is an unrelated change. The setting of the page variable was introduced to match the else part of is_domain_direct_mapped() in populate_physmap(). Re-introduce the missing hunk. Fixes: 726b737574 ("Avoid excess icache flushes in populate_physmap() before domain has been created") Signed-off-by: Punit Agrawal --- xen/common/memory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/common/memory.c b/xen/common/memory.c index 34d2dda8b4..a3cb572530 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -221,6 +221,7 @@ static void populate_physmap(struct memop_args *a) } mfn = gpfn; + page = mfn_to_page(mfn); } else {