ia64/xen-unstable

changeset 5085:e5235ca194ca

bitkeeper revision 1.1472.2.5 (429169a1lcAWUA49MVik2VTCMbi1qw)

mkbuildtree:
Remove swiotlb.c
.del-swiotlb.c~fef54ec79c58ff2d:
Delete: xen/arch/ia64/patch/linux-2.6.11/swiotlb.c
author adsharma@linux-t08.sc.intel.com
date Mon May 23 05:26:57 2005 +0000 (2005-05-23)
parents 2ea8c80c91eb
children e0e38c5651d3
files .rootkeys xen/arch/ia64/patch/linux-2.6.11/swiotlb.c xen/arch/ia64/tools/mkbuildtree
line diff
     1.1 --- a/.rootkeys	Sun May 22 19:25:39 2005 +0000
     1.2 +++ b/.rootkeys	Mon May 23 05:26:57 2005 +0000
     1.3 @@ -1141,7 +1141,6 @@ 425ae516EWaNOBEnc1xnphTbRmNZsw xen/arch/
     1.4  428bb037KSxe7_UyqseK5bWhGe3KwA xen/arch/ia64/patch/linux-2.6.11/ptrace.h
     1.5  425ae516LecDyXlwh3NLBtHZKXmMcA xen/arch/ia64/patch/linux-2.6.11/series
     1.6  425ae516RFiPn2CGkpJ21LM-1lJcQg xen/arch/ia64/patch/linux-2.6.11/setup.c
     1.7 -425ae516FX_10YaKGMU8Ysf7kkdm_A xen/arch/ia64/patch/linux-2.6.11/swiotlb.c
     1.8  425ae516p4ICTkjqNYEfYFxqULj4dw xen/arch/ia64/patch/linux-2.6.11/system.h
     1.9  425ae516juUB257qrwUdsL9AsswrqQ xen/arch/ia64/patch/linux-2.6.11/time.c
    1.10  425ae5167zQn7zYcgKtDUDX2v-e8mw xen/arch/ia64/patch/linux-2.6.11/tlb.c
     2.1 --- a/xen/arch/ia64/patch/linux-2.6.11/swiotlb.c	Sun May 22 19:25:39 2005 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,29 +0,0 @@
     2.4 ---- ../../linux-2.6.11/arch/ia64/lib/swiotlb.c	2005-03-02 00:38:17.000000000 -0700
     2.5 -+++ arch/ia64/lib/swiotlb.c	2005-05-02 13:04:15.000000000 -0600
     2.6 -@@ -49,6 +49,15 @@
     2.7 -  */
     2.8 - #define IO_TLB_SHIFT 11
     2.9 - 
    2.10 -+#ifdef XEN
    2.11 -+#define __order_to_size(_order) (1 << (_order+PAGE_SHIFT))
    2.12 -+#define alloc_bootmem_low_pages(_x) alloc_xenheap_pages(get_order(_x))
    2.13 -+#define alloc_bootmem_low(_x) alloc_xenheap_pages(get_order(_x))
    2.14 -+#define alloc_bootmem(_x) alloc_xenheap_pages(get_order(_x))
    2.15 -+#define __get_free_pages(_x,_y) alloc_xenheap_pages(__order_to_size(_y))
    2.16 -+#define free_pages(_x,_y) free_xenheap_pages(_x,_y)
    2.17 -+#endif
    2.18 -+
    2.19 - int swiotlb_force;
    2.20 - 
    2.21 - /*
    2.22 -@@ -388,8 +397,10 @@
    2.23 - 	 * When the mapping is small enough return a static buffer to limit
    2.24 - 	 * the damage, or panic when the transfer is too big.
    2.25 - 	 */
    2.26 -+#ifndef XEN
    2.27 - 	printk(KERN_ERR "PCI-DMA: Out of SW-IOMMU space for %lu bytes at "
    2.28 - 	       "device %s\n", size, dev ? dev->bus_id : "?");
    2.29 -+#endif
    2.30 - 
    2.31 - 	if (size > io_tlb_overflow && do_panic) {
    2.32 - 		if (dir == PCI_DMA_FROMDEVICE || dir == PCI_DMA_BIDIRECTIONAL)
     3.1 --- a/xen/arch/ia64/tools/mkbuildtree	Sun May 22 19:25:39 2005 +0000
     3.2 +++ b/xen/arch/ia64/tools/mkbuildtree	Mon May 23 05:26:57 2005 +0000
     3.3 @@ -141,8 +141,6 @@ softlink arch/ia64/lib/strlen.S arch/ia6
     3.4  softlink arch/ia64/lib/strlen_user.S arch/ia64/lib/strlen_user.S
     3.5  softlink arch/ia64/lib/strncpy_from_user.S arch/ia64/lib/strncpy_from_user.S
     3.6  softlink arch/ia64/lib/strnlen_user.S arch/ia64/lib/strnlen_user.S
     3.7 -#softlink arch/ia64/lib/swiotlb.c arch/ia64/lib/swiotlb.c
     3.8 -cp_patch arch/ia64/lib/swiotlb.c arch/ia64/lib/swiotlb.c swiotlb.c
     3.9  softlink arch/ia64/lib/xor.S arch/ia64/lib/xor.S
    3.10  
    3.11  softlink lib/cmdline.c arch/ia64/cmdline.c