ia64/xen-unstable

changeset 9858:b3cc9b6e470e

merge with xen-unstable.hg
author awilliam@xenbuild.aw
date Wed Apr 26 13:17:37 2006 -0600 (2006-04-26)
parents 81e0f13bf33c 1d69cff40b8c
children adb151aaf3f8
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/pci-dma-xen.c	Wed Apr 26 12:55:18 2006 -0600
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/pci-dma-xen.c	Wed Apr 26 13:17:37 2006 -0600
     1.3 @@ -93,6 +93,13 @@ dma_unmap_sg(struct device *hwdev, struc
     1.4  }
     1.5  EXPORT_SYMBOL(dma_unmap_sg);
     1.6  
     1.7 +/*
     1.8 + * XXX This file is also used by xenLinux/ia64. 
     1.9 + * "defined(__i386__) || defined (__x86_64__)" means "!defined(__ia64__)".
    1.10 + * This #if work around should be removed once this file is merbed back into
    1.11 + * i386' pci-dma or is moved to drivers/xen/core.
    1.12 + */
    1.13 +#if defined(__i386__) || defined(__x86_64__)
    1.14  dma_addr_t
    1.15  dma_map_page(struct device *dev, struct page *page, unsigned long offset,
    1.16  	     size_t size, enum dma_data_direction direction)
    1.17 @@ -122,6 +129,7 @@ dma_unmap_page(struct device *dev, dma_a
    1.18  		swiotlb_unmap_page(dev, dma_address, size, direction);
    1.19  }
    1.20  EXPORT_SYMBOL(dma_unmap_page);
    1.21 +#endif /* defined(__i386__) || defined(__x86_64__) */
    1.22  
    1.23  int
    1.24  dma_mapping_error(dma_addr_t dma_addr)
    1.25 @@ -204,6 +212,7 @@ void dma_free_coherent(struct device *de
    1.26  }
    1.27  EXPORT_SYMBOL(dma_free_coherent);
    1.28  
    1.29 +#ifdef ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
    1.30  int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
    1.31  				dma_addr_t device_addr, size_t size, int flags)
    1.32  {
    1.33 @@ -280,6 +289,7 @@ void *dma_mark_declared_memory_occupied(
    1.34  	return mem->virt_base + (pos << PAGE_SHIFT);
    1.35  }
    1.36  EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
    1.37 +#endif /* ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY */
    1.38  
    1.39  dma_addr_t
    1.40  dma_map_single(struct device *dev, void *ptr, size_t size,
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c	Wed Apr 26 12:55:18 2006 -0600
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c	Wed Apr 26 13:17:37 2006 -0600
     2.3 @@ -188,7 +188,8 @@ void force_evtchn_callback(void)
     2.4  {
     2.5  	(void)HYPERVISOR_xen_version(0, NULL);
     2.6  }
     2.7 -EXPORT_SYMBOL_GPL(force_evtchn_callback);
     2.8 +/* Not a GPL symbol: used in ubiquitous macros, so too restrictive. */
     2.9 +EXPORT_SYMBOL(force_evtchn_callback);
    2.10  
    2.11  /* NB. Interrupts are disabled on entry. */
    2.12  asmlinkage void evtchn_do_upcall(struct pt_regs *regs)
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/features.c	Wed Apr 26 12:55:18 2006 -0600
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/features.c	Wed Apr 26 13:17:37 2006 -0600
     3.3 @@ -12,7 +12,8 @@
     3.4  #include <xen/features.h>
     3.5  
     3.6  u8 xen_features[XENFEAT_NR_SUBMAPS * 32] __read_mostly;
     3.7 -EXPORT_SYMBOL_GPL(xen_features);
     3.8 +/* Not a GPL symbol: used in ubiquitous macros, so too restrictive. */
     3.9 +EXPORT_SYMBOL(xen_features);
    3.10  
    3.11  void setup_xen_features(void)
    3.12  {