ia64/xen-unstable

changeset 15760:049d4baa9965

[IA64] xencomm - compilation fix of unmodified driver

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author Alex Williamson <alex.williamson@hp.com>
date Thu Aug 16 13:46:50 2007 -0600 (2007-08-16)
parents cb3c7f006077
children 0cc2e0a1b2fc 1892f4a9822f
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 unmodified_drivers/linux-2.6/platform-pci/xen_support.c
line diff
     1.1 --- a/unmodified_drivers/linux-2.6/mkbuildtree	Thu Aug 16 13:03:41 2007 -0600
     1.2 +++ b/unmodified_drivers/linux-2.6/mkbuildtree	Thu Aug 16 13:46:50 2007 -0600
     1.3 @@ -71,8 +71,8 @@ i[34567]86)
     1.4      mkdir -p include/asm/xen
     1.5      ln -sf ${XL}/include/asm-ia64/xen/xcom_hcall.h include/asm/xen
     1.6      ln -sf ${XL}/include/asm-ia64/xen/xencomm.h include/asm/xen
     1.7 -    ln -sf ${XL}/arch/ia64/xen/xcom_mini.c platform-pci
     1.8 -    ln -sf ${XL}/arch/ia64/xen/xencomm.c platform-pci
     1.9 +    ln -sf ${XL}/arch/ia64/xen/xencomm.c platform-pci/xencomm_arch.c
    1.10 +    ln -sf ${XL}/drivers/xen/core/xencomm.c platform-pci
    1.11    ;;
    1.12  *)
    1.13      echo unknown architecture $uname
     2.1 --- a/unmodified_drivers/linux-2.6/platform-pci/Kbuild	Thu Aug 16 13:03:41 2007 -0600
     2.2 +++ b/unmodified_drivers/linux-2.6/platform-pci/Kbuild	Thu Aug 16 13:46:50 2007 -0600
     2.3 @@ -17,5 +17,5 @@ xen-platform-pci-objs += ../xenbus/xen_p
     2.4  
     2.5  # Can we do better ?
     2.6  ifeq ($(ARCH),ia64)
     2.7 -  xen-platform-pci-objs += xcom_mini.o xencomm.o
     2.8 +  xen-platform-pci-objs += xencomm.o xencomm_arch.o
     2.9  endif
     3.1 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c	Thu Aug 16 13:03:41 2007 -0600
     3.2 +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c	Thu Aug 16 13:46:50 2007 -0600
     3.3 @@ -73,7 +73,7 @@ static int __devinit init_xen_info(void)
     3.4  	extern void *shared_info_area;
     3.5  
     3.6  #ifdef __ia64__
     3.7 -	xencomm_init();
     3.8 +	xencomm_initialize();
     3.9  #endif
    3.10  
    3.11  	setup_xen_features();
     4.1 --- a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c	Thu Aug 16 13:03:41 2007 -0600
     4.2 +++ b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c	Thu Aug 16 13:46:50 2007 -0600
     4.3 @@ -48,7 +48,7 @@ EXPORT_SYMBOL(__hypercall);
     4.4  
     4.5  int HYPERVISOR_grant_table_op(unsigned int cmd, void *uop, unsigned int count)
     4.6  {
     4.7 -	return xencomm_mini_hypercall_grant_table_op(cmd, uop, count);
     4.8 +	return xencomm_hypercall_grant_table_op(cmd, uop, count);
     4.9  }
    4.10  EXPORT_SYMBOL(HYPERVISOR_grant_table_op);
    4.11