bitkeeper revision 1.1159.258.140 (428d3693Vbl1emrmRxrfYZ08RoQPjA)

Fix Linux 2.4 build on 2.0-testing

Signed-off-by: ian@xensource.com
This commit is contained in:
iap10@freefall.cl.cam.ac.uk committed 2005-05-20 01:00:03 +00:00
1 parent 25755ef315
commit b87d148b3b
4 files changed
+4 -4

No files matched your search

@@ -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
@@ -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
-2
View File
@@ -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
@@ -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>
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.