direct-io.hg

changeset 11454:b55bbf6d4e89

[IA64] machvec cleanups

Move the DIG specific platform_dma_foo defines to where they belong.

Signed-off-by: Jes Sorensen <jes@sgi.com>
author awilliam@xenbuild.aw
date Tue Sep 12 11:36:39 2006 -0600 (2006-09-12)
parents 019b7c756ddb
children 73cdbd909a8d
files linux-2.6-xen-sparse/include/asm-ia64/machvec.h linux-2.6-xen-sparse/include/asm-ia64/machvec_dig.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/machvec.h	Tue Sep 12 11:29:02 2006 -0600
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/machvec.h	Tue Sep 12 11:36:39 2006 -0600
     1.3 @@ -247,21 +247,6 @@ extern void machvec_init (const char *na
     1.4  #  error Unknown configuration.  Update asm-ia64/machvec.h.
     1.5  # endif /* CONFIG_IA64_GENERIC */
     1.6  
     1.7 -#ifdef CONFIG_XEN
     1.8 -# define platform_dma_map_sg		dma_map_sg
     1.9 -# define platform_dma_unmap_sg		dma_unmap_sg
    1.10 -# define platform_dma_mapping_error	dma_mapping_error
    1.11 -# define platform_dma_supported		dma_supported
    1.12 -# define platform_dma_alloc_coherent	dma_alloc_coherent
    1.13 -# define platform_dma_free_coherent	dma_free_coherent
    1.14 -# define platform_dma_map_single	dma_map_single
    1.15 -# define platform_dma_unmap_single	dma_unmap_single
    1.16 -# define platform_dma_sync_single_for_cpu \
    1.17 -					dma_sync_single_for_cpu
    1.18 -# define platform_dma_sync_single_for_device \
    1.19 -					dma_sync_single_for_device
    1.20 -#endif
    1.21 -
    1.22  /*
    1.23   * Declare default routines which aren't declared anywhere else:
    1.24   */
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/machvec_dig.h	Tue Sep 12 11:36:39 2006 -0600
     2.3 @@ -0,0 +1,33 @@
     2.4 +#ifndef _ASM_IA64_MACHVEC_DIG_h
     2.5 +#define _ASM_IA64_MACHVEC_DIG_h
     2.6 +
     2.7 +extern ia64_mv_setup_t dig_setup;
     2.8 +extern ia64_mv_irq_init_t dig_irq_init;
     2.9 +
    2.10 +/*
    2.11 + * This stuff has dual use!
    2.12 + *
    2.13 + * For a generic kernel, the macros are used to initialize the
    2.14 + * platform's machvec structure.  When compiling a non-generic kernel,
    2.15 + * the macros are used directly.
    2.16 + */
    2.17 +#define platform_name		"dig"
    2.18 +#define platform_setup		dig_setup
    2.19 +#define platform_irq_init	dig_irq_init
    2.20 +
    2.21 +#ifdef CONFIG_XEN
    2.22 +# define platform_dma_map_sg		dma_map_sg
    2.23 +# define platform_dma_unmap_sg		dma_unmap_sg
    2.24 +# define platform_dma_mapping_error	dma_mapping_error
    2.25 +# define platform_dma_supported		dma_supported
    2.26 +# define platform_dma_alloc_coherent	dma_alloc_coherent
    2.27 +# define platform_dma_free_coherent	dma_free_coherent
    2.28 +# define platform_dma_map_single	dma_map_single
    2.29 +# define platform_dma_unmap_single	dma_unmap_single
    2.30 +# define platform_dma_sync_single_for_cpu \
    2.31 +					dma_sync_single_for_cpu
    2.32 +# define platform_dma_sync_single_for_device \
    2.33 +					dma_sync_single_for_device
    2.34 +#endif
    2.35 +
    2.36 +#endif /* _ASM_IA64_MACHVEC_DIG_h */