ia64/xen-unstable

changeset 1760:cbf1c89cb69b

bitkeeper revision 1.1070 (40f30e57wtcdxmKl__WsIFujLBJtTg)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
author iap10@labyrinth.cl.cam.ac.uk
date Mon Jul 12 22:19:03 2004 +0000 (2004-07-12)
parents ba1f4ebe0154 e545229ff19e
children bfc886b99735
files Makefile linux-2.4.26-xen-sparse/include/asm-xen/page.h
line diff
     1.1 --- a/Makefile	Mon Jul 12 16:36:45 2004 +0000
     1.2 +++ b/Makefile	Mon Jul 12 22:19:03 2004 +0000
     1.3 @@ -36,7 +36,7 @@ LINUX_SRC        ?= $(firstword $(foreac
     1.4  pristine-linux-src: 
     1.5  ifeq ($(LINUX_SRC),)
     1.6  	@echo "Cannot find linux-$(LINUX_VER).tar.gz in path $(LINUX_SRC_PATH)"
     1.7 -	@wget ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-$(LINUX_VER).tar.bz2 -O./linux-$(LINUX_VER).tar.bz2
     1.8 +	@wget http://www.kernel.org/pub/linux/kernel/v2.4/linux-$(LINUX_VER).tar.bz2 -O./linux-$(LINUX_VER).tar.bz2
     1.9  LINUX_SRC := ./linux-$(LINUX_VER).tar.bz2 
    1.10  endif
    1.11  
     2.1 --- a/linux-2.4.26-xen-sparse/include/asm-xen/page.h	Mon Jul 12 16:36:45 2004 +0000
     2.2 +++ b/linux-2.4.26-xen-sparse/include/asm-xen/page.h	Mon Jul 12 22:19:03 2004 +0000
     2.3 @@ -10,6 +10,7 @@
     2.4  #ifndef __ASSEMBLY__
     2.5  
     2.6  #include <linux/config.h>
     2.7 +#include <asm/types.h>
     2.8  #include <asm/hypervisor-ifs/hypervisor-if.h>
     2.9  
    2.10  #ifdef CONFIG_X86_USE_3DNOW