diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-01-05 09:59:02 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 08:06:57 -0500 |
commit | 160c1d8e40866edfeae7d68816b7005d70acf391 (patch) | |
tree | 37dd78b2ea28a3953a46d401bd9657005eb444d7 /arch/ia64/include/asm/machvec.h | |
parent | f0402a262e1a4c03fc66b83659823bdcaac3c41a (diff) |
x86, ia64: convert to use generic dma_map_ops struct
This converts X86 and IA64 to use include/linux/dma-mapping.h.
It's a bit large but pretty boring. The major change for X86 is
converting 'int dir' to 'enum dma_data_direction dir' in DMA mapping
operations. The major changes for IA64 is using map_page and
unmap_page instead of map_single and unmap_single.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64/include/asm/machvec.h')
-rw-r--r-- | arch/ia64/include/asm/machvec.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h index 95e1708fa4e3..e8442c7e4cc8 100644 --- a/arch/ia64/include/asm/machvec.h +++ b/arch/ia64/include/asm/machvec.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #define _ASM_IA64_MACHVEC_H | 11 | #define _ASM_IA64_MACHVEC_H |
12 | 12 | ||
13 | #include <linux/types.h> | 13 | #include <linux/types.h> |
14 | #include <linux/swiotlb.h> | ||
15 | 14 | ||
16 | /* forward declarations: */ | 15 | /* forward declarations: */ |
17 | struct device; | 16 | struct device; |
@@ -24,6 +23,7 @@ struct task_struct; | |||
24 | struct pci_dev; | 23 | struct pci_dev; |
25 | struct msi_desc; | 24 | struct msi_desc; |
26 | struct dma_attrs; | 25 | struct dma_attrs; |
26 | enum dma_data_direction; | ||
27 | 27 | ||
28 | typedef void ia64_mv_setup_t (char **); | 28 | typedef void ia64_mv_setup_t (char **); |
29 | typedef void ia64_mv_cpu_init_t (void); | 29 | typedef void ia64_mv_cpu_init_t (void); |
@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event_t(void); | |||
45 | 45 | ||
46 | /* DMA-mapping interface: */ | 46 | /* DMA-mapping interface: */ |
47 | typedef void ia64_mv_dma_init (void); | 47 | typedef void ia64_mv_dma_init (void); |
48 | typedef struct dma_mapping_ops *ia64_mv_dma_get_ops(struct device *); | 48 | typedef struct dma_map_ops *ia64_mv_dma_get_ops(struct device *); |
49 | 49 | ||
50 | /* | 50 | /* |
51 | * WARNING: The legacy I/O space is _architected_. Platforms are | 51 | * WARNING: The legacy I/O space is _architected_. Platforms are |
@@ -97,8 +97,10 @@ machvec_noop_bus (struct pci_bus *bus) | |||
97 | 97 | ||
98 | extern void machvec_setup (char **); | 98 | extern void machvec_setup (char **); |
99 | extern void machvec_timer_interrupt (int, void *); | 99 | extern void machvec_timer_interrupt (int, void *); |
100 | extern void machvec_dma_sync_single (struct device *, dma_addr_t, size_t, int); | 100 | extern void machvec_dma_sync_single(struct device *, dma_addr_t, size_t, |
101 | extern void machvec_dma_sync_sg (struct device *, struct scatterlist *, int, int); | 101 | enum dma_data_direction); |
102 | extern void machvec_dma_sync_sg(struct device *, struct scatterlist *, int, | ||
103 | enum dma_data_direction); | ||
102 | extern void machvec_tlb_migrate_finish (struct mm_struct *); | 104 | extern void machvec_tlb_migrate_finish (struct mm_struct *); |
103 | 105 | ||
104 | # if defined (CONFIG_IA64_HP_SIM) | 106 | # if defined (CONFIG_IA64_HP_SIM) |
@@ -250,7 +252,7 @@ extern void machvec_init_from_cmdline(const char *cmdline); | |||
250 | # endif /* CONFIG_IA64_GENERIC */ | 252 | # endif /* CONFIG_IA64_GENERIC */ |
251 | 253 | ||
252 | extern void swiotlb_dma_init(void); | 254 | extern void swiotlb_dma_init(void); |
253 | extern struct dma_mapping_ops *dma_get_ops(struct device *); | 255 | extern struct dma_map_ops *dma_get_ops(struct device *); |
254 | 256 | ||
255 | /* | 257 | /* |
256 | * Define default versions so we can extend machvec for new platforms without having | 258 | * Define default versions so we can extend machvec for new platforms without having |