Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031390AbdDTRdP (ORCPT ); Thu, 20 Apr 2017 13:33:15 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:32435 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964933AbdDTRdN (ORCPT ); Thu, 20 Apr 2017 13:33:13 -0400 From: Boris Ostrovsky To: jgross@suse.com Cc: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, Boris Ostrovsky Subject: [PATCH] xen/pvh: Do not fill kernel's e820 map in init_pvh_bootparams() Date: Thu, 20 Apr 2017 13:32:37 -0400 Message-Id: <1492709557-26256-1-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 2.7.4 X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1396 Lines: 42 e820 map is updated with information from the zeropage (i.e. pvh_bootparams) by default_machine_specific_memory_setup(). With the way things are done now, we end up with a duplicated e820 map. Signed-off-by: Boris Ostrovsky --- This patch is against for-linus-4.12 branch. Since this is not a critical issue I don't want to submit it to 4.11 at rc8 time (plus it will require rebasing for-linus-4.12). arch/x86/xen/enlighten_pvh.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c index 331d769..7ce319a9 100644 --- a/arch/x86/xen/enlighten_pvh.c +++ b/arch/x86/xen/enlighten_pvh.c @@ -33,7 +33,6 @@ static void xen_pvh_arch_setup(void) static void __init init_pvh_bootparams(void) { struct xen_memory_map memmap; - unsigned int i; int rc; memset(&pvh_bootparams, 0, sizeof(pvh_bootparams)); @@ -60,12 +59,7 @@ static void __init init_pvh_bootparams(void) sanitize_e820_map(pvh_bootparams.e820_map, ARRAY_SIZE(pvh_bootparams.e820_map), &memmap.nr_entries); - pvh_bootparams.e820_entries = memmap.nr_entries; - for (i = 0; i < pvh_bootparams.e820_entries; i++) - e820_add_region(pvh_bootparams.e820_map[i].addr, - pvh_bootparams.e820_map[i].size, - pvh_bootparams.e820_map[i].type); pvh_bootparams.hdr.cmd_line_ptr = pvh_start_info.cmdline_paddr; -- 2.7.4