WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] Fix Linux 2.4 build on 2.0-testing

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] Fix Linux 2.4 build on 2.0-testing
From: BitKeeper Bot <riel@xxxxxxxxxxx>
Date: Fri, 20 May 2005 01:00:03 +0000
Delivery-date: Fri, 20 May 2005 02:03:33 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: Xen Development List <xen-devel@xxxxxxxxxxxxxxxxxxx>
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
ChangeSet 1.1874, 2005/05/20 02:00:03+01:00, iap10@xxxxxxxxxxxxxxxxxxxxx

        Fix Linux 2.4 build on 2.0-testing
        
        Signed-off-by: ian@xxxxxxxxxxxxx



 linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile        |    4 ++--
 linux-2.4.29-xen-sparse/include/asm-xen/page.h          |    1 +
 linux-2.4.29-xen-sparse/mkbuildtree                     |    2 --
 linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c |    1 +
 4 files changed, 4 insertions(+), 4 deletions(-)


diff -Nru a/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile 
b/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile
--- a/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile  2005-05-19 22:04:13 
-04:00
+++ b/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile  2005-05-19 22:04:13 
-04:00
@@ -6,12 +6,12 @@
 
 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 -Nru a/linux-2.4.29-xen-sparse/include/asm-xen/page.h 
b/linux-2.4.29-xen-sparse/include/asm-xen/page.h
--- a/linux-2.4.29-xen-sparse/include/asm-xen/page.h    2005-05-19 22:04:13 
-04:00
+++ b/linux-2.4.29-xen-sparse/include/asm-xen/page.h    2005-05-19 22:04:13 
-04:00
@@ -77,6 +77,7 @@
     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 -Nru a/linux-2.4.29-xen-sparse/mkbuildtree 
b/linux-2.4.29-xen-sparse/mkbuildtree
--- a/linux-2.4.29-xen-sparse/mkbuildtree       2005-05-19 22:04:13 -04:00
+++ b/linux-2.4.29-xen-sparse/mkbuildtree       2005-05-19 22:04:13 -04:00
@@ -207,7 +207,6 @@
 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 ../../../${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 -Nru a/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c 
b/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c   2005-05-19 
22:04:13 -04:00
+++ b/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c   2005-05-19 
22:04:13 -04:00
@@ -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>

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

<Prev in Thread] Current Thread [Next in Thread>