ia64/xen-unstable

changeset 15011:948c87ffc582

[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@valinux.co.jp>
author Alex Williamson <alex.williamson@hp.com>
date Thu May 03 14:08:24 2007 -0600 (2007-05-03)
parents 8924215a5f95
children eff2bcaeda64
files linux-2.6-xen-sparse/arch/ia64/Makefile linux-2.6-xen-sparse/arch/ia64/dig/setup.c linux-2.6-xen-sparse/arch/ia64/kernel/setup.c linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/ia64/Makefile	Thu May 03 14:01:19 2007 -0600
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Makefile	Thu May 03 14:08:24 2007 -0600
     1.3 @@ -64,12 +64,7 @@ core-$(CONFIG_IA64_SGI_SN2)	+= arch/ia64
     1.4  core-$(CONFIG_XEN)		+= arch/ia64/xen/
     1.5  
     1.6  drivers-$(CONFIG_PCI)		+= arch/ia64/pci/
     1.7 -ifneq ($(CONFIG_XEN),y)
     1.8  drivers-$(CONFIG_IA64_HP_SIM)	+= arch/ia64/hp/sim/
     1.9 -endif
    1.10 -ifneq ($(CONFIG_IA64_GENERIC),y)
    1.11 -drivers-$(CONFIG_XEN)		+= arch/ia64/hp/sim/
    1.12 -endif
    1.13  drivers-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/
    1.14  drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/
    1.15  drivers-$(CONFIG_IA64_GENERIC)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/sn/
     2.1 --- a/linux-2.6-xen-sparse/arch/ia64/dig/setup.c	Thu May 03 14:01:19 2007 -0600
     2.2 +++ b/linux-2.6-xen-sparse/arch/ia64/dig/setup.c	Thu May 03 14:08:24 2007 -0600
     2.3 @@ -24,8 +24,6 @@
     2.4  #include <asm/machvec.h>
     2.5  #include <asm/system.h>
     2.6  
     2.7 -#include <xen/xencons.h>
     2.8 -
     2.9  void __init
    2.10  dig_setup (char **cmdline_p)
    2.11  {
    2.12 @@ -69,19 +67,4 @@ dig_setup (char **cmdline_p)
    2.13  	screen_info.orig_video_mode = 3;	/* XXX fake */
    2.14  	screen_info.orig_video_isVGA = 1;	/* XXX fake */
    2.15  	screen_info.orig_video_ega_bx = 3;	/* XXX fake */
    2.16 -#ifdef CONFIG_XEN
    2.17 -	if (!is_running_on_xen() || !is_initial_xendomain())
    2.18 -		return;
    2.19 -
    2.20 -	if (xen_start_info->console.dom0.info_size >=
    2.21 -	    sizeof(struct dom0_vga_console_info)) {
    2.22 -		const struct dom0_vga_console_info *info =
    2.23 -		        (struct dom0_vga_console_info *)(
    2.24 -		                (char *)xen_start_info +
    2.25 -		                xen_start_info->console.dom0.info_off);
    2.26 -		dom0_init_screen_info(info);
    2.27 -	}
    2.28 -	xen_start_info->console.domU.mfn = 0;
    2.29 -	xen_start_info->console.domU.evtchn = 0;
    2.30 -#endif
    2.31  }
     3.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Thu May 03 14:01:19 2007 -0600
     3.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Thu May 03 14:08:24 2007 -0600
     3.3 @@ -602,6 +602,9 @@ setup_arch (char **cmdline_p)
     3.4  		ia64_mca_init();
     3.5  
     3.6  	platform_setup(cmdline_p);
     3.7 +#ifdef CONFIG_XEN
     3.8 +	xen_setup();
     3.9 +#endif
    3.10  	paging_init();
    3.11  #ifdef CONFIG_XEN
    3.12  	contiguous_bitmap_init(max_pfn);
     4.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Thu May 03 14:01:19 2007 -0600
     4.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Thu May 03 14:08:24 2007 -0600
     4.3 @@ -32,6 +32,7 @@
     4.4  #include <asm/hypervisor.h>
     4.5  #include <asm/hypercall.h>
     4.6  #include <xen/interface/memory.h>
     4.7 +#include <xen/xencons.h>
     4.8  #include <xen/balloon.h>
     4.9  
    4.10  shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)XSI_BASE;
    4.11 @@ -51,6 +52,24 @@ static int p2m_expose_init(void);
    4.12  
    4.13  EXPORT_SYMBOL(__hypercall);
    4.14  
    4.15 +void
    4.16 +xen_setup(void)
    4.17 +{
    4.18 +	if (!is_running_on_xen() || !is_initial_xendomain())
    4.19 +		return;
    4.20 +
    4.21 +	if (xen_start_info->console.dom0.info_size >=
    4.22 +	    sizeof(struct dom0_vga_console_info)) {
    4.23 +		const struct dom0_vga_console_info *info =
    4.24 +		        (struct dom0_vga_console_info *)(
    4.25 +		                (char *)xen_start_info +
    4.26 +		                xen_start_info->console.dom0.info_off);
    4.27 +		dom0_init_screen_info(info);
    4.28 +	}
    4.29 +	xen_start_info->console.domU.mfn = 0;
    4.30 +	xen_start_info->console.domU.evtchn = 0;
    4.31 +}
    4.32 +
    4.33  //XXX same as i386, x86_64 contiguous_bitmap_set(), contiguous_bitmap_clear()
    4.34  // move those to lib/contiguous_bitmap?
    4.35  //XXX discontigmem/sparsemem
     5.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Thu May 03 14:01:19 2007 -0600
     5.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Thu May 03 14:08:24 2007 -0600
     5.3 @@ -36,6 +36,7 @@
     5.4  #ifdef CONFIG_XEN
     5.5  extern int running_on_xen;
     5.6  #define is_running_on_xen()			(running_on_xen)
     5.7 +extern void xen_setup(void);
     5.8  #else /* CONFIG_XEN */
     5.9  # ifdef CONFIG_VMX_GUEST
    5.10  #  define is_running_on_xen()			(1)
    5.11 @@ -43,6 +44,7 @@ extern int running_on_xen;
    5.12  #  define is_running_on_xen()			(0)
    5.13  #  define HYPERVISOR_ioremap(offset, size)	(offset)
    5.14  # endif /* CONFIG_VMX_GUEST */
    5.15 +#define xen_setup()				do { } while (0)
    5.16  #endif /* CONFIG_XEN */
    5.17  
    5.18  #if defined(CONFIG_XEN) || defined(CONFIG_VMX_GUEST)