From patchwork Wed Apr 26 04:57:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9700277 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 BABEE603F4 for ; Wed, 26 Apr 2017 04:59:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F5FC28497 for ; Wed, 26 Apr 2017 04:59:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 908A62858D; Wed, 26 Apr 2017 04:59:54 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 0E84728497 for ; Wed, 26 Apr 2017 04:59:53 +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 1d3F11-0007OT-Iv; Wed, 26 Apr 2017 04:57:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3F0z-0007OI-Aj for Xen-devel@lists.xensource.com; Wed, 26 Apr 2017 04:57:22 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id B3/80-01730-FA820095; Wed, 26 Apr 2017 04:57:19 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprKIsWRWlGSWpSXmKPExsWSLjbBWXedBkO kwbkOHYt7U96zOzB6bO/bxR7AGMWamZeUX5HAmrH13Q62guPiFXtv72ZsYFwp0sXIxSEk0MMk sWfDImYQh0VgG4vE7u+3mboYOYEcVYmuaR9YQGw2AV2Jf6+eM4EUiQhMYpZ4828RG4jDLDCHU eLt3BVsIFXCAt4SG28fAOvmFTCTmLZ+I1icU8BcYu6/T2C2EFD81ZeXUDWCEidnPgHbwCygJf Hw1y0oW15i+9s5zBMYeWchKZuFpGwWkrIFjMyrGDWKU4vKUot0DS30kooy0zNKchMzc3QNDUz 1clOLixPTU3MSk4r1kvNzNzECg4sBCHYwNm33PMQoycGkJMpbP/lfhBBfUn5KZUZicUZ8UWlO avEhRhkODiUJXlt1hkghwaLU9NSKtMwcYJjDpCU4eJREePeqAaV5iwsSc4sz0yFSpxgVpcR5v 4AkBEASGaV5cG2w2LrEKCslzMsIdIgQT0FqUW5mCar8K0ZxDkYlYV4WkO08mXklcNNfAS1mAl o81f5PBNDikkSElFQDY8/EvuU+yuwV6h/qgycZ3U/Tdgz9vbNxUallhr5NrEPH1l8LTn2u9lW dOK2Hmb3rTrLdGqOansJb+mevrFzexRJwtaatLSzuwMpzzeyxjjKnlorff9PUdfjWsssfxA/d +DL1YYG2evp94RW5z7hY0qwmSYvsmnIhZ4PCur35KXeWuScddnVmUWIpzkg01GIuKk4EAMSMw P2oAgAA X-Env-Sender: sfr@canb.auug.org.au X-Msg-Ref: server-3.tower-206.messagelabs.com!1493182635!91478181!1 X-Originating-IP: [103.22.144.67] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64832 invoked from network); 26 Apr 2017 04:57:18 -0000 Received: from ozlabs.org (HELO ozlabs.org) (103.22.144.67) by server-3.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 26 Apr 2017 04:57:18 -0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3wCSVf2gdMz9s7M; Wed, 26 Apr 2017 14:57:14 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1493182634; bh=ud/kJbF2vt2fukgBKKy4hCDC6IfkyZkjGfX+s098z8c=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=qjvOLbfwP/gV9JCpNY5A5iT3czDrW0CInZtY+Wb+lghK8kPu2oOuI15QYOp0FXx7D StFi/cvSaPhmNwg5DJltZzDLFu1dwBIKV8+fc60LFrgONbfJbCHXSE1GA9z/+DCAKq zesA6ITpGUAqyl7JQmRlv1HxhYJXMd6hXJO1Zh+YjR/NObFjeE0eusHS93FbeESLb2 f1wt97BAlXeFGvoss5b3j/rnPqba6jWlEL+61ZgSdjTtCNo+rzV6X1C0E4pv5ycgzf fN4bblE45DZ67yjv09bhEEG3C5VGFeaFXNmpNt04UlLqEYet/DcgtKoEOo8GqxJhLQ 6QVCu+tcP/Zpw== Date: Wed, 26 Apr 2017 14:57:14 +1000 From: Stephen Rothwell To: Juergen Gross , Konrad Rzeszutek Wilk , Stefano Stabellini , Boris Ostrovsky , David Vrabel , Xen Devel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Message-ID: <20170426145714.0dfe8710@canb.auug.org.au> In-Reply-To: <20170412143021.2e3c6209@canb.auug.org.au> References: <20170412143021.2e3c6209@canb.auug.org.au> MIME-Version: 1.0 Cc: Vitaly Kuznetsov , Linux-Next Mailing List , Linux Kernel Mailing List Subject: Re: [Xen-devel] linux-next: manual merge of the xen-tip tree with the tip tree 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 Hi all, On Wed, 12 Apr 2017 14:30:21 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the xen-tip tree got a conflict in: > > arch/x86/xen/enlighten.c > > between commit: > > 687d77a5f7b2 ("x86/xen: Update e820 table handling to the new core x86 E820 code") > > from the tip tree and commit: > > ca7b75377014 ("x86/xen: split off enlighten_pvh.c") > > from the xen-tip tree. > > The latter moved the code changed by the former to another file, so I > have applied the following merge fix patch. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. The fix patch now looks like this: From: Stephen Rothwell Date: Wed, 12 Apr 2017 14:27:23 +1000 Subject: [PATCH] x86/xen: merge fix for arch/x86/xen/enlighten.c code movement Signed-off-by: Stephen Rothwell --- arch/x86/xen/enlighten_pvh.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c index 2bc7d5bb01cf..98ab17673454 100644 --- a/arch/x86/xen/enlighten_pvh.c +++ b/arch/x86/xen/enlighten_pvh.c @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -37,8 +38,8 @@ static void __init init_pvh_bootparams(void) memset(&pvh_bootparams, 0, sizeof(pvh_bootparams)); - memmap.nr_entries = ARRAY_SIZE(pvh_bootparams.e820_map); - set_xen_guest_handle(memmap.buffer, pvh_bootparams.e820_map); + memmap.nr_entries = ARRAY_SIZE(pvh_bootparams.e820_table); + set_xen_guest_handle(memmap.buffer, pvh_bootparams.e820_table); rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap); if (rc) { xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc); @@ -46,13 +47,13 @@ static void __init init_pvh_bootparams(void) } pvh_bootparams.e820_entries = memmap.nr_entries; - if (pvh_bootparams.e820_entries < E820MAX - 1) { - pvh_bootparams.e820_map[pvh_bootparams.e820_entries].addr = + if (pvh_bootparams.e820_entries < E820_MAX_ENTRIES_ZEROPAGE - 1) { + pvh_bootparams.e820_table[pvh_bootparams.e820_entries].addr = ISA_START_ADDRESS; - pvh_bootparams.e820_map[pvh_bootparams.e820_entries].size = + pvh_bootparams.e820_table[pvh_bootparams.e820_entries].size = ISA_END_ADDRESS - ISA_START_ADDRESS; - pvh_bootparams.e820_map[pvh_bootparams.e820_entries].type = - E820_RESERVED; + pvh_bootparams.e820_table[pvh_bootparams.e820_entries].type = + E820_TYPE_RESERVED; pvh_bootparams.e820_entries++; } else xen_raw_printk("Warning: Can fit ISA range into e820\n");