ia64/xen-unstable

changeset 5978:c56a9805216a

Accomodate ia64-xenolinux change where xen-public is symlinked to
xen source now.

Signed-off-by Kevin Tian <kevin.tian@intel.com>
author fred@xuni-t01.sc.intel.com
date Tue Aug 09 02:32:52 2005 -0800 (2005-08-09)
parents 88bfc84c5a75
children a6bb47919161 8bd2dc2c653d
files xen/arch/ia64/Rules.mk xen/include/public/arch-ia64.h
line diff
     1.1 --- a/xen/arch/ia64/Rules.mk	Mon Aug 08 13:20:33 2005 -0800
     1.2 +++ b/xen/arch/ia64/Rules.mk	Tue Aug 09 02:32:52 2005 -0800
     1.3 @@ -22,7 +22,7 @@ CFLAGS  += -I$(BASEDIR)/include/asm-ia64
     1.4             -I$(BASEDIR)/include/asm-ia64/linux-xen 			\
     1.5             -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen
     1.6  CFLAGS  += -Wno-pointer-arith -Wredundant-decls
     1.7 -CFLAGS  += -DIA64 -DXEN -DLINUX_2_6
     1.8 +CFLAGS  += -DIA64 -DXEN -DLINUX_2_6 -DXEN_HYPERVISOR
     1.9  CFLAGS	+= -ffixed-r13 -mfixed-range=f12-f15,f32-f127
    1.10  CFLAGS	+= -w -g
    1.11  ifeq ($(CONFIG_VTI),y)
     2.1 --- a/xen/include/public/arch-ia64.h	Mon Aug 08 13:20:33 2005 -0800
     2.2 +++ b/xen/include/public/arch-ia64.h	Tue Aug 09 02:32:52 2005 -0800
     2.3 @@ -57,7 +57,11 @@ struct pt_fpreg {
     2.4          } u;
     2.5  };
     2.6  
     2.7 +#ifdef XEN_HYPERVISOR
     2.8  struct pt_regs {
     2.9 +#else
    2.10 +struct xen_pt_regs {
    2.11 +#endif
    2.12  	/* The following registers are saved by SAVE_MIN: */
    2.13  	unsigned long b6;		/* scratch */
    2.14  	unsigned long b7;		/* scratch */
    2.15 @@ -274,7 +278,11 @@ typedef struct vcpu_guest_context {
    2.16  	unsigned long vm_assist;   /* VMASST_TYPE_* bitmap, now none on IPF */
    2.17  	unsigned long guest_iip;   /* Guest entry point */
    2.18  
    2.19 +#ifdef XEN_HYPERVISOR
    2.20  	struct pt_regs regs;
    2.21 +#else
    2.22 +	struct xen_pt_regs regs;
    2.23 +#endif
    2.24  	arch_vcpu_info_t vcpu;
    2.25  	arch_shared_info_t shared;
    2.26  } vcpu_guest_context_t;