ia64/xen-unstable

changeset 8187:d616f22ffdd9

Minor changes due to file movement to merge xen-unstable with xen-ia64-unstable
author djm@kirby.fc.hp.com
date Fri Dec 02 12:55:00 2005 -0600 (2005-12-02)
parents 28bd01c9b596
children 3a4589331504
files xen/arch/ia64/Makefile xen/include/public/io/blkif.h
line diff
     1.1 --- a/xen/arch/ia64/Makefile	Fri Dec 02 12:52:25 2005 -0600
     1.2 +++ b/xen/arch/ia64/Makefile	Fri Dec 02 12:55:00 2005 -0600
     1.3 @@ -69,6 +69,8 @@ asm-xsi-offsets.s: asm-xsi-offsets.c
     1.4  	[ -e $(BASEDIR)/include/asm-ia64/xen ] \
     1.5  	 || ln -s $(BASEDIR)/include/asm-ia64/linux $(BASEDIR)/include/asm-ia64/xen
     1.6  # Link to DM file in Xen for ia64/vti
     1.7 +	[ -e $(BASEDIR)/include/asm-ia64/vmx_vpic.h ] \
     1.8 +	 || ln -s ../../include/asm-x86/vmx_vpic.h $(BASEDIR)/include/asm-ia64/vmx_vpic.h
     1.9  	[ -e $(BASEDIR)/include/asm-ia64/vmx_vioapic.h ] \
    1.10  	 || ln -s ../../include/asm-x86/vmx_vioapic.h $(BASEDIR)/include/asm-ia64/vmx_vioapic.h
    1.11  	[ -e $(BASEDIR)/arch/ia64/vmx/vmx_vioapic.c ] \
     2.1 --- a/xen/include/public/io/blkif.h	Fri Dec 02 12:52:25 2005 -0600
     2.2 +++ b/xen/include/public/io/blkif.h	Fri Dec 02 12:55:00 2005 -0600
     2.3 @@ -11,6 +11,8 @@
     2.4  
     2.5  #include "ring.h"
     2.6  
     2.7 +#include <asm-xen/gnttab.h>	/* for grant_ref_t */
     2.8 +
     2.9  /*
    2.10   * Front->back notifications: When enqueuing a new request, sending a
    2.11   * notification can be made conditional on req_event (i.e., the generic