[Xen-changelog] [xen-unstable] [IA64] Sparse tree cleanup

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1178222904 21600
# Node ID 948c87ffc582089c19ff0e3406509f48d0f93c08
# Parent  8924215a5f952d3127d24203a14e4b8d7e642a69
[IA64] Sparse tree cleanup

With this patch we can remove linux-2.6-xen-sparse/arch/ia64/dig/setup.c,
linux-2.6-xen-sparse/include/asm-ia64/machvec.h.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/arch/ia64/Makefile            |    5 -----
 linux-2.6-xen-sparse/arch/ia64/dig/setup.c         |   17 -----------------
 linux-2.6-xen-sparse/arch/ia64/kernel/setup.c      |    3 +++
 linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c    |   19 +++++++++++++++++++
 linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h |    2 ++
 5 files changed, 24 insertions(+), 22 deletions(-)

diff -r 8924215a5f95 -r 948c87ffc582 linux-2.6-xen-sparse/arch/ia64/Makefile
--- a/linux-2.6-xen-sparse/arch/ia64/Makefile   Thu May 03 14:01:19 2007 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/Makefile   Thu May 03 14:08:24 2007 -0600
@@ -64,12 +64,7 @@ core-$(CONFIG_XEN)           += arch/ia64/xen/
 core-$(CONFIG_XEN)             += arch/ia64/xen/
 
 drivers-$(CONFIG_PCI)          += arch/ia64/pci/
-ifneq ($(CONFIG_XEN),y)
 drivers-$(CONFIG_IA64_HP_SIM)  += arch/ia64/hp/sim/
-endif
-ifneq ($(CONFIG_IA64_GENERIC),y)
-drivers-$(CONFIG_XEN)          += arch/ia64/hp/sim/
-endif
 drivers-$(CONFIG_IA64_HP_ZX1)  += arch/ia64/hp/common/ arch/ia64/hp/zx1/
 drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/
 drivers-$(CONFIG_IA64_GENERIC) += arch/ia64/hp/common/ arch/ia64/hp/zx1/ 
arch/ia64/hp/sim/ arch/ia64/sn/
diff -r 8924215a5f95 -r 948c87ffc582 linux-2.6-xen-sparse/arch/ia64/dig/setup.c
--- a/linux-2.6-xen-sparse/arch/ia64/dig/setup.c        Thu May 03 14:01:19 
2007 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/dig/setup.c        Thu May 03 14:08:24 
2007 -0600
@@ -23,8 +23,6 @@
 #include <asm/io.h>
 #include <asm/machvec.h>
 #include <asm/system.h>
-
-#include <xen/xencons.h>
 
 void __init
 dig_setup (char **cmdline_p)
@@ -69,19 +67,4 @@ dig_setup (char **cmdline_p)
        screen_info.orig_video_mode = 3;        /* XXX fake */
        screen_info.orig_video_isVGA = 1;       /* XXX fake */
        screen_info.orig_video_ega_bx = 3;      /* XXX fake */
-#ifdef CONFIG_XEN
-       if (!is_running_on_xen() || !is_initial_xendomain())
-               return;
-
-       if (xen_start_info->console.dom0.info_size >=
-           sizeof(struct dom0_vga_console_info)) {
-               const struct dom0_vga_console_info *info =
-                       (struct dom0_vga_console_info *)(
-                               (char *)xen_start_info +
-                               xen_start_info->console.dom0.info_off);
-               dom0_init_screen_info(info);
-       }
-       xen_start_info->console.domU.mfn = 0;
-       xen_start_info->console.domU.evtchn = 0;
-#endif
 }
diff -r 8924215a5f95 -r 948c87ffc582 
linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
--- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c     Thu May 03 14:01:19 
2007 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c     Thu May 03 14:08:24 
2007 -0600
@@ -602,6 +602,9 @@ setup_arch (char **cmdline_p)
                ia64_mca_init();
 
        platform_setup(cmdline_p);
+#ifdef CONFIG_XEN
+       xen_setup();
+#endif
        paging_init();
 #ifdef CONFIG_XEN
        contiguous_bitmap_init(max_pfn);
diff -r 8924215a5f95 -r 948c87ffc582 
linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c   Thu May 03 14:01:19 
2007 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c   Thu May 03 14:08:24 
2007 -0600
@@ -32,6 +32,7 @@
 #include <asm/hypervisor.h>
 #include <asm/hypercall.h>
 #include <xen/interface/memory.h>
+#include <xen/xencons.h>
 #include <xen/balloon.h>
 
 shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)XSI_BASE;
@@ -50,6 +51,24 @@ static int p2m_expose_init(void);
 #endif
 
 EXPORT_SYMBOL(__hypercall);
+
+void
+xen_setup(void)
+{
+       if (!is_running_on_xen() || !is_initial_xendomain())
+               return;
+
+       if (xen_start_info->console.dom0.info_size >=
+           sizeof(struct dom0_vga_console_info)) {
+               const struct dom0_vga_console_info *info =
+                       (struct dom0_vga_console_info *)(
+                               (char *)xen_start_info +
+                               xen_start_info->console.dom0.info_off);
+               dom0_init_screen_info(info);
+       }
+       xen_start_info->console.domU.mfn = 0;
+       xen_start_info->console.domU.evtchn = 0;
+}
 
 //XXX same as i386, x86_64 contiguous_bitmap_set(), contiguous_bitmap_clear()
 // move those to lib/contiguous_bitmap?
diff -r 8924215a5f95 -r 948c87ffc582 
linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h        Thu May 03 
14:01:19 2007 -0600
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h        Thu May 03 
14:08:24 2007 -0600
@@ -36,6 +36,7 @@
 #ifdef CONFIG_XEN
 extern int running_on_xen;
 #define is_running_on_xen()                    (running_on_xen)
+extern void xen_setup(void);
 #else /* CONFIG_XEN */
 # ifdef CONFIG_VMX_GUEST
 #  define is_running_on_xen()                  (1)
@@ -43,6 +44,7 @@ extern int running_on_xen;
 #  define is_running_on_xen()                  (0)
 #  define HYPERVISOR_ioremap(offset, size)     (offset)
 # endif /* CONFIG_VMX_GUEST */
+#define xen_setup()                            do { } while (0)
 #endif /* CONFIG_XEN */
 
 #if defined(CONFIG_XEN) || defined(CONFIG_VMX_GUEST)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog