[Xen-changelog] Fix 2.4 build.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1424, 2005/04/01 15:41:31+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Fix 2.4 build.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 kernel/pci-dma.c |    5 +++--
 mm/hypervisor.c  |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c 
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c    2005-04-01 
10:03:25 -05:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c    2005-04-01 
10:03:25 -05:00
@@ -13,10 +13,11 @@
 #include <linux/pci.h>
 #include <linux/version.h>
 #include <asm/io.h>
-#include <asm/tlbflush.h>
 #include <asm-xen/balloon.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#include <asm/tlbflush.h>
+#else
 #define pte_offset_kernel pte_offset
 #define pud_t pgd_t
 #define pud_offset(d, va) d
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c 
b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c     2005-04-01 
10:03:25 -05:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c     2005-04-01 
10:03:26 -05:00
@@ -33,11 +33,11 @@
 #include <linux/vmalloc.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/tlbflush.h>
 #include <asm-xen/hypervisor.h>
 #include <asm-xen/balloon.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <linux/percpu.h>
+#include <asm/tlbflush.h>
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)

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