[Xen-changelog] domain.h, xenmem.c, mkbuildtree, slab.h, setup.c:

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1657, 2005/06/03 02:34:53+01:00, cl349@xxxxxxxxxxxxxxxxxxxxx

        domain.h, xenmem.c, mkbuildtree, slab.h, setup.c:
          Fix ia64 build.
        Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>



 arch/ia64/patch/linux-2.6.11/setup.c |    2 +-
 arch/ia64/tools/mkbuildtree          |    1 +
 arch/ia64/xenmem.c                   |    1 +
 include/asm-ia64/domain.h            |    1 +
 include/asm-ia64/slab.h              |    3 +++
 5 files changed, 7 insertions(+), 1 deletion(-)


diff -Nru a/xen/arch/ia64/patch/linux-2.6.11/setup.c 
b/xen/arch/ia64/patch/linux-2.6.11/setup.c
--- a/xen/arch/ia64/patch/linux-2.6.11/setup.c  2005-06-02 22:03:01 -04:00
+++ b/xen/arch/ia64/patch/linux-2.6.11/setup.c  2005-06-02 22:03:01 -04:00
@@ -1,12 +1,13 @@
 --- 
/home/adsharma/disk2/xen-ia64/xeno-unstable-rebase.bk/xen/../../linux-2.6.11/arch/ia64/kernel/setup.c
      2005-03-01 23:37:49.000000000 -0800
 +++ 
/home/adsharma/disk2/xen-ia64/xeno-unstable-rebase.bk/xen/arch/ia64/setup.c     
   2005-05-18 12:40:50.000000000 -0700
-@@ -51,6 +51,9 @@
+@@ -51,6 +51,10 @@
  #include <asm/smp.h>
  #include <asm/system.h>
  #include <asm/unistd.h>
 +#ifdef CONFIG_VTI
 +#include <asm/vmx.h>
 +#endif // CONFIG_VTI
++#include <asm/io.h>
  
  #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
  # error "struct cpuinfo_ia64 too big!"
diff -Nru a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree
--- a/xen/arch/ia64/tools/mkbuildtree   2005-06-02 22:03:01 -04:00
+++ b/xen/arch/ia64/tools/mkbuildtree   2005-06-02 22:03:01 -04:00
@@ -48,6 +48,7 @@
 # use "gcc -Iinclude/asm-ia64" to find these linux includes
 #ln -s $XEN/include/xen $XEN/include/linux
 #ln -s $XEN/include/asm-ia64/linux $XEN/include/asm-ia64/xen 
+ln -s ../slab.h include/asm-ia64/linux/slab.h
 
 # prepare for building asm-offsets (circular dependency)
 #echo '#define IA64_TASK_SIZE 0' > include/asm-ia64/asm-offsets.h
diff -Nru a/xen/arch/ia64/xenmem.c b/xen/arch/ia64/xenmem.c
--- a/xen/arch/ia64/xenmem.c    2005-06-02 22:03:01 -04:00
+++ b/xen/arch/ia64/xenmem.c    2005-06-02 22:03:01 -04:00
@@ -11,6 +11,7 @@
 
 #include <linux/config.h>
 #include <asm/pgtable.h>
+#include <asm/mm.h>
 
 extern struct page *zero_page_memmap_ptr;
 struct pfn_info *frame_table;
diff -Nru a/xen/include/asm-ia64/domain.h b/xen/include/asm-ia64/domain.h
--- a/xen/include/asm-ia64/domain.h     2005-06-02 22:03:01 -04:00
+++ b/xen/include/asm-ia64/domain.h     2005-06-02 22:03:01 -04:00
@@ -7,6 +7,7 @@
 #include <asm/vmmu.h>
 #include <asm/regionreg.h>
 #endif // CONFIG_VTI
+#include <xen/list.h>
 
 extern void arch_do_createdomain(struct vcpu *);
 
diff -Nru a/xen/include/asm-ia64/slab.h b/xen/include/asm-ia64/slab.h
--- /dev/null   Wed Dec 31 16:00:00 196900
+++ b/xen/include/asm-ia64/slab.h       2005-06-02 22:03:01 -04:00
@@ -0,0 +1,3 @@
+#include <xen/xmalloc.h>
+#include <linux/gfp.h>
+#include <asm/delay.h>

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