bitkeeper revision 1.1159.1.275 (417d602cyKuqblSyKliOgatz5hdcRw)

Fix 2.4.x build after 2.6.9 upgrade.

diff --git a/.bk-to-hg b/.bk-to-hg
index 12a1c40d891ffefa0990137249e67059443e0e6a..039e4d0069c5c26909f86c505b9de66182e6d1f3 100755 (executable)
--- a/.bk-to-hg
+++ b/.bk-to-hg
@@ -1,6 +1,2 @@
-#!/bin/sh -x
-set -e
-test -L linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/balloon.c
-rm      linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/balloon.c
-(find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true
+#!/bin/sh
 exit 0

diff --git a/.hg-to-bk b/.hg-to-bk
index 61fc3a1ccf096d3a0ef60b48eb340d61d1e6e5b6..039e4d0069c5c26909f86c505b9de66182e6d1f3 100755 (executable)
--- a/.hg-to-bk
+++ b/.hg-to-bk
@@ -1,10 +1,2 @@
-#!/bin/sh -x
-set -e
-mkdir -p linux-2.4.27-xen-sparse
-mkdir -p linux-2.4.27-xen-sparse/arch
-mkdir -p linux-2.4.27-xen-sparse/arch/xen
-mkdir -p linux-2.4.27-xen-sparse/arch/xen/drivers
-mkdir -p linux-2.4.27-xen-sparse/arch/xen/drivers/balloon
-ln -s ../../../../../linux-2.6.8.1-xen-sparse/drivers/xen/balloon/balloon.c linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/balloon.c
-(find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true
+#!/bin/sh
 exit 0

diff --git a/.rootkeys b/.rootkeys
index d354f0a9e6e918edd7e692c2d764cf93a613ca6a..f9832944b952e57f66a7f0ef24543ef07a18f213 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
@@ -47,7 +47,6 @@
 40648526SxcA4lGIHB_k7ID8VlRSzw linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0
 40c73c77QesbL7eIvG-fJGAtVwhGRg linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU
 3e6377f5xwPfYZkPHPrDbEq1PRN7uQ linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/Makefile
-4177c0c3ju-Bo3TJaQHh4fOsy06UgQ linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/balloon.c
 4083dc16z0jvZEH4PiVDbDRreaNp6w linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile
 4083dc16KQus88a4U3uCV6qVCA6_8Q linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/backend/Makefile
 4075806dI5kfeMD5RV-DA0PYoThx_w linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile

diff --git a/linux-2.4.27-xen-sparse/mkbuildtree b/linux-2.4.27-xen-sparse/mkbuildtree
index e691097b232422ca33f477691c658ff4d6617a48..3180d21675cdafac892cfa34f1a3c72e1e36468c 100755 (executable)
--- a/linux-2.4.27-xen-sparse/mkbuildtree
+++ b/linux-2.4.27-xen-sparse/mkbuildtree
@@ -247,6 +247,9 @@ ln -sf ../../i386/mm/extable.c
 ln -sf ../../i386/mm/pageattr.c 
 ln -sf ../../../${LINUX_26}/arch/xen/i386/mm/hypervisor.c
 
+cd ${AD}/arch/xen/drivers/balloon
+ln -sf ../../../../${LINUX_26}/drivers/xen/balloon/balloon.c
+
 cd ${AD}/arch/xen/drivers/console
 ln -sf ../../../../${LINUX_26}/drivers/xen/console/console.c 
 

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/pci-dma.c b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/pci-dma.c
index 49a58006fb412015f64652d6bbe1ff580a0a0d33..b7939cff41ca5fbda39e1d9437f339cf4672e784 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/pci-dma.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/pci-dma.c
@@ -14,6 +14,10 @@
 #include <linux/version.h>
 #include <asm/io.h>
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+#define pte_offset_kernel pte_offset
+#endif
+
 struct dma_coherent_mem {
        void            *virt_base;
        u32             device_base;
@@ -22,8 +26,8 @@ struct dma_coherent_mem {
        unsigned long   *bitmap;
 };
 
-void
-dma_contig_memory(unsigned long vstart, unsigned int order)
+static void
+xen_contig_memory(unsigned long vstart, unsigned int order)
 {
        /*
         * Ensure multi-page extents are contiguous in machine memory.
@@ -69,7 +73,6 @@ dma_contig_memory(unsigned long vstart, unsigned int order)
 }
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#define pte_offset_kernel pte_offset
 void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
                           dma_addr_t *dma_handle)
 #else
@@ -114,7 +117,7 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
        if (ret == NULL)
                return ret;
 
-       dma_contig_memory(vstart, order);
+       xen_contig_memory(vstart, order);
 
        memset(ret, 0, size);
        *dma_handle = virt_to_bus(ret);
@@ -125,10 +128,13 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 void pci_free_consistent(struct pci_dev *hwdev, size_t size,
                         void *vaddr, dma_addr_t dma_handle)
+{
+       free_pages((unsigned long)vaddr, get_order(size));
+}
 #else
+
 void dma_free_coherent(struct device *dev, size_t size,
                         void *vaddr, dma_addr_t dma_handle)
-#endif
 {
        struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
        int order = get_order(size);
@@ -216,3 +222,5 @@ void *dma_mark_declared_memory_occupied(struct device *dev,
        return mem->virt_base + (pos << PAGE_SHIFT);
 }
 EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
+
+#endif