diff options
| -rw-r--r-- | .rootkeys | 1 | ||||
| -rw-r--r-- | xen/arch/ia64/patch/linux-2.6.11/swiotlb.c | 29 | ||||
| -rw-r--r-- | xen/arch/ia64/tools/mkbuildtree | 2 |
3 files changed, 0 insertions, 32 deletions
@@ -1141,7 +1141,6 @@ 428bb037KSxe7_UyqseK5bWhGe3KwA xen/arch/ia64/patch/linux-2.6.11/ptrace.h 425ae516LecDyXlwh3NLBtHZKXmMcA xen/arch/ia64/patch/linux-2.6.11/series 425ae516RFiPn2CGkpJ21LM-1lJcQg xen/arch/ia64/patch/linux-2.6.11/setup.c -425ae516FX_10YaKGMU8Ysf7kkdm_A xen/arch/ia64/patch/linux-2.6.11/swiotlb.c 425ae516p4ICTkjqNYEfYFxqULj4dw xen/arch/ia64/patch/linux-2.6.11/system.h 425ae516juUB257qrwUdsL9AsswrqQ xen/arch/ia64/patch/linux-2.6.11/time.c 425ae5167zQn7zYcgKtDUDX2v-e8mw xen/arch/ia64/patch/linux-2.6.11/tlb.c diff --git a/xen/arch/ia64/patch/linux-2.6.11/swiotlb.c b/xen/arch/ia64/patch/linux-2.6.11/swiotlb.c deleted file mode 100644 index fc239138a7..0000000000 --- a/xen/arch/ia64/patch/linux-2.6.11/swiotlb.c +++ /dev/null @@ -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 --git a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree index 7da20d095a..34ff02fa94 100644 --- a/xen/arch/ia64/tools/mkbuildtree +++ b/xen/arch/ia64/tools/mkbuildtree @@ -141,8 +141,6 @@ softlink arch/ia64/lib/strlen.S arch/ia64/lib/strlen.S 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 |