xen-unstable.hg

changeset 11974:7c2a5f96a192

[IA64] Xencomm fixes for HVM PV-drivers

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>
author awilliam@xenbuild.aw
date Sat Oct 14 16:28:32 2006 -0600 (2006-10-14)
parents 9e8fdcc46fa3
children c8fa605f131f
files unmodified_drivers/linux-2.6/mkbuildtree unmodified_drivers/linux-2.6/platform-pci/Kbuild unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
line diff
     1.1 --- a/unmodified_drivers/linux-2.6/mkbuildtree	Sat Oct 14 16:26:27 2006 -0600
     1.2 +++ b/unmodified_drivers/linux-2.6/mkbuildtree	Sat Oct 14 16:28:32 2006 -0600
     1.3 @@ -19,6 +19,7 @@ mkdir -p include
     1.4  mkdir -p include/xen
     1.5  mkdir -p include/public
     1.6  mkdir -p include/asm
     1.7 +mkdir -p include/asm/xen
     1.8  
     1.9  lndir -silent ${XL}/include/xen include/xen
    1.10  ln -sf ${XEN}/include/public include/xen/interface
    1.11 @@ -47,6 +48,10 @@ i[34567]86)
    1.12  	ln -sf ${XL}/include/asm-ia64/hypercall.h include/asm
    1.13  	ln -sf ${XL}/include/asm-ia64/synch_bitops.h include/asm
    1.14  	ln -sf ${XL}/include/asm-ia64/maddr.h include/asm
    1.15 +	ln -sf ${XL}/include/asm-ia64/xen/xcom_hcall.h include/asm/xen
    1.16 +	ln -sf ${XL}/include/asm-ia64/xen/xencomm.h include/asm/xen
    1.17 + 	ln -sf ${XL}/arch/ia64/xen/xcom_mini.c platform-pci
    1.18 + 	ln -sf ${XL}/arch/ia64/xen/xencomm.c platform-pci
    1.19  	;;
    1.20  *)
    1.21  	echo unknown architecture $uname
     2.1 --- a/unmodified_drivers/linux-2.6/platform-pci/Kbuild	Sat Oct 14 16:26:27 2006 -0600
     2.2 +++ b/unmodified_drivers/linux-2.6/platform-pci/Kbuild	Sat Oct 14 16:28:32 2006 -0600
     2.3 @@ -5,3 +5,8 @@ obj-m := xen-platform-pci.o
     2.4  EXTRA_CFLAGS += -I$(M)/platform-pci
     2.5  
     2.6  xen-platform-pci-objs := evtchn.o platform-pci.o gnttab.o xen_support.o features.o
     2.7 +
     2.8 +# Can we do better ?
     2.9 +ifeq ($(ARCH),ia64)
    2.10 +  xen-platform-pci-objs += xcom_mini.o xencomm.o
    2.11 +endif
     3.1 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c	Sat Oct 14 16:26:27 2006 -0600
     3.2 +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c	Sat Oct 14 16:28:32 2006 -0600
     3.3 @@ -35,6 +35,9 @@
     3.4  #include <asm/hypervisor.h>
     3.5  #include <xen/interface/memory.h>
     3.6  #include <xen/features.h>
     3.7 +#ifdef __ia64__
     3.8 +#include <asm/xen/xencomm.h>
     3.9 +#endif
    3.10  
    3.11  #include "platform-pci.h"
    3.12  
    3.13 @@ -59,6 +62,10 @@ static int __init init_xen_info(void)
    3.14  	struct xen_add_to_physmap xatp;
    3.15  	extern void *shared_info_area;
    3.16  
    3.17 +#ifdef __ia64__
    3.18 +	xencomm_init();
    3.19 +#endif
    3.20 +
    3.21  	setup_xen_features();
    3.22  
    3.23  	shared_info_frame = alloc_xen_mmio(PAGE_SIZE) >> PAGE_SHIFT;