[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Tue, 2 Feb 2010 16:19:05 +0800
From: Sheng Yang <sheng@...ux.intel.com>
To: Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com>,
Keir Fraser <keir.fraser@...citrix.com>
Cc: xen-devel <xen-devel@...ts.xensource.com>,
linux-kernel@...r.kernel.org, Sheng Yang <sheng@...ux.intel.com>,
Ingo Molnar <mingo@...e.hu>
Subject: [PATCH 4/6] xen/hybrid: The entrance for Hybrid
xen_hybrid_init() would setup Hybrid environment.
Cc: Ingo Molnar <mingo@...e.hu>
Signed-off-by: Sheng Yang <sheng@...ux.intel.com>
---
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 <asm/mce.h>
+#ifdef CONFIG_XEN
+#include <xen/xen.h>
+#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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists