[Xen-changelog] [xen-unstable] [IA64] machvec cleanups

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID b55bbf6d4e8903d941cdd10e4ddc8eff7c7b9ff3
# Parent  019b7c756ddb5e588644f97f051b3dc2d6f29509
[IA64] machvec cleanups

Move the DIG specific platform_dma_foo defines to where they belong.

Signed-off-by: Jes Sorensen <jes@xxxxxxx>
---
 linux-2.6-xen-sparse/include/asm-ia64/machvec.h     |   15 ---------
 linux-2.6-xen-sparse/include/asm-ia64/machvec_dig.h |   33 ++++++++++++++++++++
 2 files changed, 33 insertions(+), 15 deletions(-)

diff -r 019b7c756ddb -r b55bbf6d4e89 
linux-2.6-xen-sparse/include/asm-ia64/machvec.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/machvec.h   Tue Sep 12 11:29:02 
2006 -0600
+++ b/linux-2.6-xen-sparse/include/asm-ia64/machvec.h   Tue Sep 12 11:36:39 
2006 -0600
@@ -247,21 +247,6 @@ extern void machvec_init (const char *na
 #  error Unknown configuration.  Update asm-ia64/machvec.h.
 # endif /* CONFIG_IA64_GENERIC */
 
-#ifdef CONFIG_XEN
-# define platform_dma_map_sg           dma_map_sg
-# define platform_dma_unmap_sg         dma_unmap_sg
-# define platform_dma_mapping_error    dma_mapping_error
-# define platform_dma_supported                dma_supported
-# define platform_dma_alloc_coherent   dma_alloc_coherent
-# define platform_dma_free_coherent    dma_free_coherent
-# define platform_dma_map_single       dma_map_single
-# define platform_dma_unmap_single     dma_unmap_single
-# define platform_dma_sync_single_for_cpu \
-                                       dma_sync_single_for_cpu
-# define platform_dma_sync_single_for_device \
-                                       dma_sync_single_for_device
-#endif
-
 /*
  * Declare default routines which aren't declared anywhere else:
  */
diff -r 019b7c756ddb -r b55bbf6d4e89 
linux-2.6-xen-sparse/include/asm-ia64/machvec_dig.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/linux-2.6-xen-sparse/include/asm-ia64/machvec_dig.h       Tue Sep 12 
11:36:39 2006 -0600
@@ -0,0 +1,33 @@
+#ifndef _ASM_IA64_MACHVEC_DIG_h
+#define _ASM_IA64_MACHVEC_DIG_h
+
+extern ia64_mv_setup_t dig_setup;
+extern ia64_mv_irq_init_t dig_irq_init;
+
+/*
+ * This stuff has dual use!
+ *
+ * For a generic kernel, the macros are used to initialize the
+ * platform's machvec structure.  When compiling a non-generic kernel,
+ * the macros are used directly.
+ */
+#define platform_name          "dig"
+#define platform_setup         dig_setup
+#define platform_irq_init      dig_irq_init
+
+#ifdef CONFIG_XEN
+# define platform_dma_map_sg           dma_map_sg
+# define platform_dma_unmap_sg         dma_unmap_sg
+# define platform_dma_mapping_error    dma_mapping_error
+# define platform_dma_supported                dma_supported
+# define platform_dma_alloc_coherent   dma_alloc_coherent
+# define platform_dma_free_coherent    dma_free_coherent
+# define platform_dma_map_single       dma_map_single
+# define platform_dma_unmap_single     dma_unmap_single
+# define platform_dma_sync_single_for_cpu \
+                                       dma_sync_single_for_cpu
+# define platform_dma_sync_single_for_device \
+                                       dma_sync_single_for_device
+#endif
+
+#endif /* _ASM_IA64_MACHVEC_DIG_h */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog