[Xen-changelog] Accomodate ia64-xenolinux change where xen-public is symlinked to

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

# HG changeset patch
# User fred@xxxxxxxxxxxxxxxxxxxxx
# Node ID c56a9805216a23c014d91d213a7a0962566b76fc
# Parent  88bfc84c5a75edd1b02c9bd77d21c0a080c0844c
Accomodate ia64-xenolinux change where xen-public is symlinked to
xen source now.

Signed-off-by Kevin Tian <kevin.tian@xxxxxxxxx>

diff -r 88bfc84c5a75 -r c56a9805216a xen/arch/ia64/Rules.mk
--- a/xen/arch/ia64/Rules.mk    Mon Aug  8 21:20:33 2005
+++ b/xen/arch/ia64/Rules.mk    Tue Aug  9 10:32:52 2005
@@ -22,7 +22,7 @@
            -I$(BASEDIR)/include/asm-ia64/linux-xen                     \
            -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen
 CFLAGS  += -Wno-pointer-arith -Wredundant-decls
-CFLAGS  += -DIA64 -DXEN -DLINUX_2_6
+CFLAGS  += -DIA64 -DXEN -DLINUX_2_6 -DXEN_HYPERVISOR
 CFLAGS += -ffixed-r13 -mfixed-range=f12-f15,f32-f127
 CFLAGS += -w -g
 ifeq ($(CONFIG_VTI),y)
diff -r 88bfc84c5a75 -r c56a9805216a xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h    Mon Aug  8 21:20:33 2005
+++ b/xen/include/public/arch-ia64.h    Tue Aug  9 10:32:52 2005
@@ -57,7 +57,11 @@
         } u;
 };
 
+#ifdef XEN_HYPERVISOR
 struct pt_regs {
+#else
+struct xen_pt_regs {
+#endif
        /* The following registers are saved by SAVE_MIN: */
        unsigned long b6;               /* scratch */
        unsigned long b7;               /* scratch */
@@ -274,7 +278,11 @@
        unsigned long vm_assist;   /* VMASST_TYPE_* bitmap, now none on IPF */
        unsigned long guest_iip;   /* Guest entry point */
 
+#ifdef XEN_HYPERVISOR
        struct pt_regs regs;
+#else
+       struct xen_pt_regs regs;
+#endif
        arch_vcpu_info_t vcpu;
        arch_shared_info_t shared;
 } vcpu_guest_context_t;

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