# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID b3cc9b6e470e8b8033450c6744801ae889f958a3
# Parent 81e0f13bf33c121f0cd848ef92e490cd2553f179
# Parent 1d69cff40b8c7a71d1e2a26f99d9605f311b0772
merge with xen-unstable.hg
diff -r 81e0f13bf33c -r b3cc9b6e470e
linux-2.6-xen-sparse/arch/i386/kernel/pci-dma-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/pci-dma-xen.c Wed Apr 26
12:55:18 2006 -0600
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/pci-dma-xen.c Wed Apr 26
13:17:37 2006 -0600
@@ -93,6 +93,13 @@ dma_unmap_sg(struct device *hwdev, struc
}
EXPORT_SYMBOL(dma_unmap_sg);
+/*
+ * XXX This file is also used by xenLinux/ia64.
+ * "defined(__i386__) || defined (__x86_64__)" means "!defined(__ia64__)".
+ * This #if work around should be removed once this file is merbed back into
+ * i386' pci-dma or is moved to drivers/xen/core.
+ */
+#if defined(__i386__) || defined(__x86_64__)
dma_addr_t
dma_map_page(struct device *dev, struct page *page, unsigned long offset,
size_t size, enum dma_data_direction direction)
@@ -122,6 +129,7 @@ dma_unmap_page(struct device *dev, dma_a
swiotlb_unmap_page(dev, dma_address, size, direction);
}
EXPORT_SYMBOL(dma_unmap_page);
+#endif /* defined(__i386__) || defined(__x86_64__) */
int
dma_mapping_error(dma_addr_t dma_addr)
@@ -204,6 +212,7 @@ void dma_free_coherent(struct device *de
}
EXPORT_SYMBOL(dma_free_coherent);
+#ifdef ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
dma_addr_t device_addr, size_t size, int flags)
{
@@ -280,6 +289,7 @@ void *dma_mark_declared_memory_occupied(
return mem->virt_base + (pos << PAGE_SHIFT);
}
EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
+#endif /* ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY */
dma_addr_t
dma_map_single(struct device *dev, void *ptr, size_t size,
diff -r 81e0f13bf33c -r b3cc9b6e470e
linux-2.6-xen-sparse/drivers/xen/core/evtchn.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c Wed Apr 26 12:55:18
2006 -0600
+++ b/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c Wed Apr 26 13:17:37
2006 -0600
@@ -188,7 +188,8 @@ void force_evtchn_callback(void)
{
(void)HYPERVISOR_xen_version(0, NULL);
}
-EXPORT_SYMBOL_GPL(force_evtchn_callback);
+/* Not a GPL symbol: used in ubiquitous macros, so too restrictive. */
+EXPORT_SYMBOL(force_evtchn_callback);
/* NB. Interrupts are disabled on entry. */
asmlinkage void evtchn_do_upcall(struct pt_regs *regs)
diff -r 81e0f13bf33c -r b3cc9b6e470e
linux-2.6-xen-sparse/drivers/xen/core/features.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/features.c Wed Apr 26 12:55:18
2006 -0600
+++ b/linux-2.6-xen-sparse/drivers/xen/core/features.c Wed Apr 26 13:17:37
2006 -0600
@@ -12,7 +12,8 @@
#include <xen/features.h>
u8 xen_features[XENFEAT_NR_SUBMAPS * 32] __read_mostly;
-EXPORT_SYMBOL_GPL(xen_features);
+/* Not a GPL symbol: used in ubiquitous macros, so too restrictive. */
+EXPORT_SYMBOL(xen_features);
void setup_xen_features(void)
{
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home