# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Date 1174568114 -32400
# Node ID eaeeefd8cddb55016ccd10e4d8b56db71963e67c
# Parent  d1bd4110c3b1406594ec3a638371f0e72568bf3f
The ia64 p2m semantic is now fixed. remove unnecessary work around patch.
PATCHNAME: remove_work_round

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r d1bd4110c3b1 -r eaeeefd8cddb linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Fri Mar 23 11:29:36 2007 +0900
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Thu Mar 22 21:55:14 2007 +0900
@@ -205,18 +205,6 @@ static void contiguous_bitmap_clear(
 #define MAX_CONTIG_ORDER 7
 static unsigned long discontig_frames[1<<MAX_CONTIG_ORDER];
 
-/* Width of DMA addresses. 30 bits is a b44 limitation. */
-#define DEFAULT_DMA_BITS 30
-static unsigned int xen_ia64_dma_bits = DEFAULT_DMA_BITS;
-
-static int __init
-setup_dma_bits(char *str)
-{
-	xen_ia64_dma_bits = simple_strtoul(str, NULL, 0);
-	return 0;
-}
-__setup("xen_ia64_dma_bits=", setup_dma_bits);
-
 /* Ensure multi-page extents are contiguous in machine memory. */
 int
 __xen_create_contiguous_region(unsigned long vstart,
@@ -245,15 +233,6 @@ __xen_create_contiguous_region(unsigned 
 		 },
 		.nr_exchanged = 0
 	};
-
-	/*
-	 * XXX xen/ia64 vmm bug work around
-	 * the c/s 13366:ed73ff8440d8 of xen-unstable.hg revealed that
-	 * XENMEM_exchange has been broken on Xen/ia64.
-	 * This is work around for it until the right fix.
-	 */
-	if (address_bits < xen_ia64_dma_bits)
-		return -ENOSYS;
 
 	if (unlikely(order > MAX_CONTIG_ORDER))
 		return -ENOMEM;