Commit e1531b42 authored by John W. Linville's avatar John W. Linville Committed by Linus Torvalds

[PATCH] ia64: re-implement dma_get_cache_alignment to avoid EXPORT_SYMBOL

The current ia64 implementation of dma_get_cache_alignment does not work
for modules because it relies on a symbol which is not exported.  Direct
access to a global is a little ugly anyway, so this patch re-implements
dma_get_cache_alignment in a manner similar to what is currently used for
x86_64.
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4ecc65e4
...@@ -92,6 +92,13 @@ extern void efi_initialize_iomem_resources(struct resource *, ...@@ -92,6 +92,13 @@ extern void efi_initialize_iomem_resources(struct resource *,
extern char _text[], _end[], _etext[]; extern char _text[], _end[], _etext[];
unsigned long ia64_max_cacheline_size; unsigned long ia64_max_cacheline_size;
int dma_get_cache_alignment(void)
{
return ia64_max_cacheline_size;
}
EXPORT_SYMBOL(dma_get_cache_alignment);
unsigned long ia64_iobase; /* virtual address for I/O accesses */ unsigned long ia64_iobase; /* virtual address for I/O accesses */
EXPORT_SYMBOL(ia64_iobase); EXPORT_SYMBOL(ia64_iobase);
struct io_space io_space[MAX_IO_SPACES]; struct io_space io_space[MAX_IO_SPACES];
......
...@@ -48,12 +48,7 @@ dma_set_mask (struct device *dev, u64 mask) ...@@ -48,12 +48,7 @@ dma_set_mask (struct device *dev, u64 mask)
return 0; return 0;
} }
static inline int extern int dma_get_cache_alignment(void);
dma_get_cache_alignment (void)
{
extern int ia64_max_cacheline_size;
return ia64_max_cacheline_size;
}
static inline void static inline void
dma_cache_sync (void *vaddr, size_t size, enum dma_data_direction dir) dma_cache_sync (void *vaddr, size_t size, enum dma_data_direction dir)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment