diff options
| author | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-05-20 01:00:03 +0000 |
|---|---|---|
| committer | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-05-20 01:00:03 +0000 |
| commit | b87d148b3b6fcbfe1d5c093f68a59989b05e9e79 (patch) | |
| tree | b4308d7117a9333ee2186cc53bc50bf9693bf858 | |
| parent | 25755ef315b1529b3c68aec577195645e30a706a (diff) | |
| download | xen-b87d148b3b6fcbfe1d5c093f68a59989b05e9e79.tar.gz xen-b87d148b3b6fcbfe1d5c093f68a59989b05e9e79.tar.bz2 xen-b87d148b3b6fcbfe1d5c093f68a59989b05e9e79.zip | |
bitkeeper revision 1.1159.258.140 (428d3693Vbl1emrmRxrfYZ08RoQPjA)
Fix Linux 2.4 build on 2.0-testing
Signed-off-by: ian@xensource.com
| -rw-r--r-- | linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile | 4 | ||||
| -rw-r--r-- | linux-2.4.29-xen-sparse/include/asm-xen/page.h | 1 | ||||
| -rwxr-xr-x | linux-2.4.29-xen-sparse/mkbuildtree | 2 | ||||
| -rw-r--r-- | linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile b/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile index 3eb0701958..b17b430bf3 100644 --- a/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile +++ b/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile @@ -6,12 +6,12 @@ all: kernel.o head.o init_task.o O_TARGET := kernel.o -export-objs := i386_ksyms.o gnttab.o skbuff.o ctrl_if.o +export-objs := i386_ksyms.o skbuff.o ctrl_if.o obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \ ptrace.o ioport.o ldt.o setup.o time.o sys_i386.o \ i386_ksyms.o i387.o evtchn.o ctrl_if.o pci-dma.o \ - reboot.o fixup.o gnttab.o skbuff.o + reboot.o fixup.o skbuff.o ifdef CONFIG_PCI obj-y += pci-i386.o pci-pc.o diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/page.h b/linux-2.4.29-xen-sparse/include/asm-xen/page.h index 546cb65b22..ca73ccfc31 100644 --- a/linux-2.4.29-xen-sparse/include/asm-xen/page.h +++ b/linux-2.4.29-xen-sparse/include/asm-xen/page.h @@ -77,6 +77,7 @@ static inline unsigned long pte_val(pte_t x) if ( (ret & 1) ) ret = machine_to_phys(ret); return ret; } +#define pte_val_ma(x) ((x).pte_low) #endif #define PTE_MASK PAGE_MASK diff --git a/linux-2.4.29-xen-sparse/mkbuildtree b/linux-2.4.29-xen-sparse/mkbuildtree index acf4fb2f85..7e8177802c 100755 --- a/linux-2.4.29-xen-sparse/mkbuildtree +++ b/linux-2.4.29-xen-sparse/mkbuildtree @@ -207,7 +207,6 @@ ln -sf ../asm-i386/vm86.h ln -sf ../../${LINUX_26}/include/asm-xen/balloon.h ln -sf ../../${LINUX_26}/include/asm-xen/ctrl_if.h ln -sf ../../${LINUX_26}/include/asm-xen/evtchn.h -ln -sf ../../${LINUX_26}/include/asm-xen/gnttab.h ln -sf ../../${LINUX_26}/include/asm-xen/hypervisor.h ln -sf ../../${LINUX_26}/include/asm-xen/multicall.h ln -sf ../../${LINUX_26}/include/asm-xen/xen_proc.h @@ -228,7 +227,6 @@ ln -sf ../../i386/kernel/sys_i386.c ln -sf ../../../${LINUX_26}/arch/xen/kernel/ctrl_if.c ln -sf ../../../${LINUX_26}/arch/xen/kernel/evtchn.c ln -sf ../../../${LINUX_26}/arch/xen/kernel/fixup.c -ln -sf ../../../${LINUX_26}/arch/xen/kernel/gnttab.c ln -sf ../../../${LINUX_26}/arch/xen/kernel/reboot.c ln -sf ../../../${LINUX_26}/arch/xen/kernel/skbuff.c ln -sf ../../../${LINUX_26}/arch/xen/i386/kernel/ioport.c diff --git a/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c index ccf2fb07da..55d2670944 100644 --- a/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c @@ -45,6 +45,7 @@ #include <net/arp.h> #include <net/route.h> #include <asm/io.h> +#include <asm/uaccess.h> #include <asm-xen/evtchn.h> #include <asm-xen/ctrl_if.h> #include <asm-xen/xen-public/io/netif.h> |