From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751318Ab0CAJhx (ORCPT ); Mon, 1 Mar 2010 04:37:53 -0500 Received: from mga11.intel.com ([192.55.52.93]:57735 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750885Ab0CAJhq (ORCPT ); Mon, 1 Mar 2010 04:37:46 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,559,1262592000"; d="scan'208";a="544840235" From: Sheng Yang To: Keir Fraser , Jeremy Fitzhardinge , Ian Pratt Cc: Ian Campbell , Stefano Stabellini , xen-devel , linux-kernel@vger.kernel.org, Sheng Yang , Ingo Molnar Subject: [PATCH 4/7] xen: The entrance for PV extension of HVM Date: Mon, 1 Mar 2010 17:38:32 +0800 Message-Id: <1267436315-24486-5-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1267436315-24486-1-git-send-email-sheng@linux.intel.com> References: <1267436315-24486-1-git-send-email-sheng@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org xen_guest_init() would setup the environment. Cc: Ingo Molnar Signed-off-by: Sheng Yang --- arch/x86/kernel/setup.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 5d9e40c..2b61d46 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -113,6 +113,10 @@ #endif #include +#ifdef CONFIG_XEN +#include +#endif + /* * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries. * The direct mapping extends to max_pfn_mapped, so that we can directly access @@ -740,6 +744,10 @@ void __init setup_arch(char **cmdline_p) x86_init.oem.arch_setup(); +#ifdef CONFIG_XEN + xen_guest_init(); +#endif + setup_memory_map(); parse_setup_data(); /* update the e820_saved too */ -- 1.5.4.5