[Xen-changelog] Merge http://djm@sportsman//home/djm/xeno-unstable-ia64.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1311.1.36, 2005/03/24 09:32:41-07:00, djm@djmnc4000.(none)

        Merge http://djm@sportsman//home/djm/xeno-unstable-ia64.bk
        into djmnc4000.(none):/home/djm/src/xen/xeno-unstable-ia64.bk



 mkbuildtree |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)


diff -Nru a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree
--- a/xen/arch/ia64/tools/mkbuildtree   2005-03-25 19:05:35 -05:00
+++ b/xen/arch/ia64/tools/mkbuildtree   2005-03-25 19:05:35 -05:00
@@ -52,7 +52,7 @@
 ln -s $XEN/include/asm-ia64/linux $XEN/include/asm-ia64/xen 
 
 # prepare for building asm-offsets (circular dependency)
-touch include/asm-ia64/asm-offsets.h
+echo '#define IA64_TASK_SIZE 0' > include/asm-ia64/asm-offsets.h
 sleep 2
 touch arch/ia64/asm-offsets.c
 
@@ -94,9 +94,9 @@
 cp_patch arch/ia64/kernel/unaligned.c arch/ia64/unaligned.c unaligned.c
 cp_patch arch/ia64/kernel/vmlinux.lds.S arch/ia64/xen.lds.S lds.S
 
-cp_patch mm/bootmem.c arch/ia64/mm_bootmem.c mm_bootmem.c
-cp_patch mm/page_alloc.c arch/ia64/page_alloc.c page_alloc.c
-cp_patch mm/slab.c arch/ia64/slab.c slab.c
+#cp_patch mm/bootmem.c arch/ia64/mm_bootmem.c mm_bootmem.c
+#cp_patch mm/page_alloc.c arch/ia64/page_alloc.c page_alloc.c
+#cp_patch mm/slab.c arch/ia64/slab.c slab.c
 
 # following renamed to avoid conflict
 softlink kernel/extable.c arch/ia64/linuxextable.c
@@ -140,7 +140,8 @@
 softlink arch/ia64/lib/strlen_user.S arch/ia64/lib/strlen_user.S
 softlink arch/ia64/lib/strncpy_from_user.S arch/ia64/lib/strncpy_from_user.S
 softlink arch/ia64/lib/strnlen_user.S arch/ia64/lib/strnlen_user.S
-softlink arch/ia64/lib/swiotlb.c arch/ia64/lib/swiotlb.c
+#softlink arch/ia64/lib/swiotlb.c arch/ia64/lib/swiotlb.c
+cp_patch arch/ia64/lib/swiotlb.c arch/ia64/lib/swiotlb.c swiotlb.c
 softlink arch/ia64/lib/xor.S arch/ia64/lib/xor.S
 
 softlink lib/cmdline.c arch/ia64/cmdline.c
@@ -222,7 +223,8 @@
 softlink include/asm-ia64/patch.h include/asm-ia64/patch.h
 softlink include/asm-ia64/pci.h include/asm-ia64/pci.h
 softlink include/asm-ia64/percpu.h include/asm-ia64/percpu.h
-softlink include/asm-ia64/pgalloc.h include/asm-ia64/pgalloc.h
+#softlink include/asm-ia64/pgalloc.h include/asm-ia64/pgalloc.h
+cp_patch include/asm-ia64/pgalloc.h include/asm-ia64/pgalloc.h pgalloc.h
 softlink include/asm-ia64/pgtable.h include/asm-ia64/pgtable.h
 softlink include/asm-ia64/ptrace.h include/asm-ia64/ptrace.h
 softlink include/asm-ia64/ptrace_offsets.h include/asm-ia64/ptrace_offsets.h


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/xen-changelog