From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sheng Yang Subject: [PATCH 4/6] xen/hybrid: The entrance for Hybrid Date: Tue, 2 Feb 2010 16:19:05 +0800 Message-ID: <1265098747-10117-5-git-send-email-sheng@linux.intel.com> References: <1265098747-10117-1-git-send-email-sheng@linux.intel.com> Return-path: In-Reply-To: <1265098747-10117-1-git-send-email-sheng@linux.intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Jeremy Fitzhardinge , Keir Fraser Cc: Ingo Molnar , xen-devel , linux-kernel@vger.kernel.org, Sheng Yang List-Id: xen-devel@lists.xenproject.org xen_hybrid_init() would setup Hybrid 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 f7b8b98..db82295 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 @@ -732,6 +736,10 @@ void __init setup_arch(char **cmdline_p) x86_init.oem.arch_setup(); +#ifdef CONFIG_XEN + xen_hybrid_init(); +#endif + setup_memory_map(); parse_setup_data(); /* update the e820_saved too */ -- 1.5.4.5