ia64/xen-unstable

changeset 4428:c2f2989b8637

bitkeeper revision 1.1236.1.188 (424d5d9bWJxugg2qyufAbqW_Iw8ing)

Fix 2.4 build.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Fri Apr 01 14:41:31 2005 +0000 (2005-04-01)
parents 3b7f9e76f29a
children b0da7900bbbb
files linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c	Fri Apr 01 14:41:16 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c	Fri Apr 01 14:41:31 2005 +0000
     1.3 @@ -13,10 +13,11 @@
     1.4  #include <linux/pci.h>
     1.5  #include <linux/version.h>
     1.6  #include <asm/io.h>
     1.7 -#include <asm/tlbflush.h>
     1.8  #include <asm-xen/balloon.h>
     1.9  
    1.10 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
    1.11 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
    1.12 +#include <asm/tlbflush.h>
    1.13 +#else
    1.14  #define pte_offset_kernel pte_offset
    1.15  #define pud_t pgd_t
    1.16  #define pud_offset(d, va) d
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c	Fri Apr 01 14:41:16 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c	Fri Apr 01 14:41:31 2005 +0000
     2.3 @@ -33,11 +33,11 @@
     2.4  #include <linux/vmalloc.h>
     2.5  #include <asm/page.h>
     2.6  #include <asm/pgtable.h>
     2.7 -#include <asm/tlbflush.h>
     2.8  #include <asm-xen/hypervisor.h>
     2.9  #include <asm-xen/balloon.h>
    2.10  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
    2.11  #include <linux/percpu.h>
    2.12 +#include <asm/tlbflush.h>
    2.13  #endif
    2.14  
    2.15  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)