diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-16 04:09:10 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-16 04:09:10 -0500 |
commit | af2519fb2298cdf7540082c36f4d8c66bbff103f (patch) | |
tree | 1d290d28d42d42f9e693457762c4008988628060 /arch/ia64/include/asm/machvec.h | |
parent | 961d7d0ee5150e0197cc81c2a8884ecb230276e2 (diff) | |
parent | 7cb36b6ccdca03bd87e8faca7fd920643dd1aec7 (diff) |
Merge branch 'linus' into core/iommu
Conflicts:
arch/ia64/include/asm/dma-mapping.h
arch/ia64/include/asm/machvec.h
arch/ia64/include/asm/machvec_sn2.h
Diffstat (limited to 'arch/ia64/include/asm/machvec.h')
-rw-r--r-- | arch/ia64/include/asm/machvec.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h index 22a75fb55adb..367d299d9938 100644 --- a/arch/ia64/include/asm/machvec.h +++ b/arch/ia64/include/asm/machvec.h | |||
@@ -44,6 +44,7 @@ typedef void ia64_mv_kernel_launch_event_t(void); | |||
44 | 44 | ||
45 | /* DMA-mapping interface: */ | 45 | /* DMA-mapping interface: */ |
46 | typedef void ia64_mv_dma_init (void); | 46 | typedef void ia64_mv_dma_init (void); |
47 | typedef u64 ia64_mv_dma_get_required_mask (struct device *); | ||
47 | typedef struct dma_map_ops *ia64_mv_dma_get_ops(struct device *); | 48 | typedef struct dma_map_ops *ia64_mv_dma_get_ops(struct device *); |
48 | 49 | ||
49 | /* | 50 | /* |
@@ -128,6 +129,7 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *); | |||
128 | # define platform_global_tlb_purge ia64_mv.global_tlb_purge | 129 | # define platform_global_tlb_purge ia64_mv.global_tlb_purge |
129 | # define platform_tlb_migrate_finish ia64_mv.tlb_migrate_finish | 130 | # define platform_tlb_migrate_finish ia64_mv.tlb_migrate_finish |
130 | # define platform_dma_init ia64_mv.dma_init | 131 | # define platform_dma_init ia64_mv.dma_init |
132 | # define platform_dma_get_required_mask ia64_mv.dma_get_required_mask | ||
131 | # define platform_dma_get_ops ia64_mv.dma_get_ops | 133 | # define platform_dma_get_ops ia64_mv.dma_get_ops |
132 | # define platform_irq_to_vector ia64_mv.irq_to_vector | 134 | # define platform_irq_to_vector ia64_mv.irq_to_vector |
133 | # define platform_local_vector_to_irq ia64_mv.local_vector_to_irq | 135 | # define platform_local_vector_to_irq ia64_mv.local_vector_to_irq |
@@ -171,6 +173,7 @@ struct ia64_machine_vector { | |||
171 | ia64_mv_global_tlb_purge_t *global_tlb_purge; | 173 | ia64_mv_global_tlb_purge_t *global_tlb_purge; |
172 | ia64_mv_tlb_migrate_finish_t *tlb_migrate_finish; | 174 | ia64_mv_tlb_migrate_finish_t *tlb_migrate_finish; |
173 | ia64_mv_dma_init *dma_init; | 175 | ia64_mv_dma_init *dma_init; |
176 | ia64_mv_dma_get_required_mask *dma_get_required_mask; | ||
174 | ia64_mv_dma_get_ops *dma_get_ops; | 177 | ia64_mv_dma_get_ops *dma_get_ops; |
175 | ia64_mv_irq_to_vector *irq_to_vector; | 178 | ia64_mv_irq_to_vector *irq_to_vector; |
176 | ia64_mv_local_vector_to_irq *local_vector_to_irq; | 179 | ia64_mv_local_vector_to_irq *local_vector_to_irq; |
@@ -210,6 +213,7 @@ struct ia64_machine_vector { | |||
210 | platform_global_tlb_purge, \ | 213 | platform_global_tlb_purge, \ |
211 | platform_tlb_migrate_finish, \ | 214 | platform_tlb_migrate_finish, \ |
212 | platform_dma_init, \ | 215 | platform_dma_init, \ |
216 | platform_dma_get_required_mask, \ | ||
213 | platform_dma_get_ops, \ | 217 | platform_dma_get_ops, \ |
214 | platform_irq_to_vector, \ | 218 | platform_irq_to_vector, \ |
215 | platform_local_vector_to_irq, \ | 219 | platform_local_vector_to_irq, \ |
@@ -284,6 +288,9 @@ extern struct dma_map_ops *dma_get_ops(struct device *); | |||
284 | #ifndef platform_dma_get_ops | 288 | #ifndef platform_dma_get_ops |
285 | # define platform_dma_get_ops dma_get_ops | 289 | # define platform_dma_get_ops dma_get_ops |
286 | #endif | 290 | #endif |
291 | #ifndef platform_dma_get_required_mask | ||
292 | # define platform_dma_get_required_mask ia64_dma_get_required_mask | ||
293 | #endif | ||
287 | #ifndef platform_irq_to_vector | 294 | #ifndef platform_irq_to_vector |
288 | # define platform_irq_to_vector __ia64_irq_to_vector | 295 | # define platform_irq_to_vector __ia64_irq_to_vector |
289 | #endif | 296 | #endif |