direct-io.hg

changeset 11464:3bff5c5b9206

Fix unmodified drivers for PV-on-HVM on IA64.

Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@jp.fujitsu.com>
Signed-off-by: Tomonari Horikoshi <t.horikoshi@jp.fujitsu.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Sep 13 14:34:34 2006 +0100 (2006-09-13)
parents 7474bb5e2923
children 8c0cf4d3c412
files unmodified_drivers/linux-2.6/mkbuildtree unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
line diff
     1.1 --- a/unmodified_drivers/linux-2.6/mkbuildtree	Wed Sep 13 14:30:06 2006 +0100
     1.2 +++ b/unmodified_drivers/linux-2.6/mkbuildtree	Wed Sep 13 14:34:34 2006 +0100
     1.3 @@ -42,6 +42,12 @@ i[34567]86)
     1.4  	ln -sf ${XL}/include/asm-i386/mach-xen/asm/synch_bitops.h include/asm
     1.5  	ln -sf ${XL}/include/asm-i386/mach-xen/asm/maddr.h include/asm
     1.6  	;;
     1.7 +"ia64")
     1.8 +	ln -sf ${XL}/include/asm-ia64/hypervisor.h include/asm
     1.9 +	ln -sf ${XL}/include/asm-ia64/hypercall.h include/asm
    1.10 +	ln -sf ${XL}/include/asm-ia64/synch_bitops.h include/asm
    1.11 +	ln -sf ${XL}/include/asm-ia64/maddr.h include/asm
    1.12 +	;;
    1.13  *)
    1.14  	echo unknown architecture $uname
    1.15  	exit 1
     2.1 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c	Wed Sep 13 14:30:06 2006 +0100
     2.2 +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c	Wed Sep 13 14:34:34 2006 +0100
     2.3 @@ -117,6 +117,7 @@ unsigned long alloc_xen_mmio(unsigned lo
     2.4  	return addr;
     2.5  }
     2.6  
     2.7 +#ifndef __ia64__
     2.8  /* Lifted from hvmloader.c */
     2.9  static int get_hypercall_stubs(void)
    2.10  {
    2.11 @@ -162,6 +163,9 @@ static int get_hypercall_stubs(void)
    2.12  
    2.13  	return 0;
    2.14  }
    2.15 +#else /* __ia64__ */
    2.16 +#define get_hypercall_stubs()	(0)
    2.17 +#endif
    2.18  
    2.19  static int __devinit platform_pci_init(struct pci_dev *pdev,
    2.20  				       const struct pci_device_id *ent)
    2.21 @@ -207,7 +211,6 @@ static int __devinit platform_pci_init(s
    2.22  	if (ret < 0)
    2.23  		goto out;
    2.24  
    2.25 -	
    2.26  	if ((ret = init_xen_info()))
    2.27  		goto out;
    2.28