[Xen-changelog] [xen-unstable] [IA64] Remove P2M workaround

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxxx
# Date 1174922245 21600
# Node ID 16198b57f53513b86dd3ce9af4fa206bbd1920ab
# Parent  fa77ec03afd609b095ce5813a776123b176c8b67
[IA64] Remove P2M workaround

The ia64 p2m semantic is now fixed. remove unnecessary work around patch.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c |   21 ---------------------
 1 files changed, 21 deletions(-)

diff -r fa77ec03afd6 -r 16198b57f535 
linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c   Mon Mar 26 09:15:17 
2007 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c   Mon Mar 26 09:17:25 
2007 -0600
@@ -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;

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