[Xen-changelog] mkbuildtree:

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1472.2.5, 2005/05/22 22:26:57-07:00, adsharma@xxxxxxxxxxxxxxxxxxxxxx

        mkbuildtree:
          Remove swiotlb.c
        .del-swiotlb.c~fef54ec79c58ff2d:
          Delete: xen/arch/ia64/patch/linux-2.6.11/swiotlb.c



 b/xen/arch/ia64/tools/mkbuildtree          |    2 --
 xen/arch/ia64/patch/linux-2.6.11/swiotlb.c |   28 ----------------------------
 2 files changed, 30 deletions(-)


diff -Nru a/xen/arch/ia64/patch/linux-2.6.11/swiotlb.c 
b/xen/arch/ia64/patch/linux-2.6.11/swiotlb.c
--- a/xen/arch/ia64/patch/linux-2.6.11/swiotlb.c        2005-05-23 12:04:23 
-04:00
+++ /dev/null   Wed Dec 31 16:00:00 196900
@@ -1,29 +0,0 @@
---- ../../linux-2.6.11/arch/ia64/lib/swiotlb.c 2005-03-02 00:38:17.000000000 
-0700
-+++ arch/ia64/lib/swiotlb.c    2005-05-02 13:04:15.000000000 -0600
-@@ -49,6 +49,15 @@
-  */
- #define IO_TLB_SHIFT 11
- 
-+#ifdef XEN
-+#define __order_to_size(_order) (1 << (_order+PAGE_SHIFT))
-+#define alloc_bootmem_low_pages(_x) alloc_xenheap_pages(get_order(_x))
-+#define alloc_bootmem_low(_x) alloc_xenheap_pages(get_order(_x))
-+#define alloc_bootmem(_x) alloc_xenheap_pages(get_order(_x))
-+#define __get_free_pages(_x,_y) alloc_xenheap_pages(__order_to_size(_y))
-+#define free_pages(_x,_y) free_xenheap_pages(_x,_y)
-+#endif
-+
- int swiotlb_force;
- 
- /*
-@@ -388,8 +397,10 @@
-        * When the mapping is small enough return a static buffer to limit
-        * the damage, or panic when the transfer is too big.
-        */
-+#ifndef XEN
-       printk(KERN_ERR "PCI-DMA: Out of SW-IOMMU space for %lu bytes at "
-              "device %s\n", size, dev ? dev->bus_id : "?");
-+#endif
- 
-       if (size > io_tlb_overflow && do_panic) {
-               if (dir == PCI_DMA_FROMDEVICE || dir == PCI_DMA_BIDIRECTIONAL)
diff -Nru a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree
--- a/xen/arch/ia64/tools/mkbuildtree   2005-05-23 12:04:23 -04:00
+++ b/xen/arch/ia64/tools/mkbuildtree   2005-05-23 12:04:23 -04:00
@@ -141,8 +141,6 @@
 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
-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

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