Skip to contentSkip to conversation

ia64: add EXPORT_SYMBOL_GPL for ia64_max_cacheline_size

PATCH In review John W. Linville 3 participants 6 messages Sep 12, 2005 – Sep 13, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ia64: add EXPORT_SYMBOL_GPL for ia64_max_cacheline_size

The implementation of dma_get_cache_alignment for ia64 makes reference to ia64_max_cacheline_size inside of a static inline. For this to work for modules, this needs to be EXPORT_SYMBOL{,_GPL}.

---

 arch/ia64/kernel/setup.c |    1 +
 1 files changed, 1 insertion(+)
arch/ia64/kernel/setup.c +1 -0
@@ -79,6 +79,7 @@ unsigned long vga_console_iobase;
 unsigned long vga_console_membase;
 
 unsigned long ia64_max_cacheline_size;
+EXPORT_SYMBOL_GPL(ia64_max_cacheline_size);
 unsigned long ia64_iobase;	/* virtual address for I/O accesses */
 EXPORT_SYMBOL(ia64_iobase);
 struct io_space io_space[MAX_IO_SPACES];
#1 lore raw
Quoted 3 lines · John W. Linville

The implementation of dma_get_cache_alignment for ia64 makes reference to ia64_max_cacheline_size inside of a static inline. For this to work for modules, this needs to be EXPORT_SYMBOL{,_GPL}.

This is not supposed to be a _GPL api. best just move dma_get_cache_alignment out of line.

#2 lore raw
Quoted 7 lines · Christoph Hellwig
Quoted 3 lines · John W. Linville

The implementation of dma_get_cache_alignment for ia64 makes reference to ia64_max_cacheline_size inside of a static inline. For this to work for modules, this needs to be EXPORT_SYMBOL{,_GPL}.

This is not supposed to be a _GPL api. best just move dma_get_cache_alignment out of line.

You are thinking of something like the x86_64 implementation? That seems reasonable to me. Patch to follow...

John

Signature · 2 lines
John W. Linville
[email protected]
#3 lore raw

PATCH 1/1 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.

---
This patch replaces the patch at the link below:

	http://www.ussg.iu.edu/hypermail/linux/kernel/0509.1/1365.html
 arch/ia64/kernel/setup.c       |    7 +++++++
 include/asm-ia64/dma-mapping.h |    7 +------
 2 files changed, 8 insertions(+), 6 deletions(-)
arch/ia64/kernel/setup.c +7 -0
@@ -79,6 +79,13 @@ unsigned long vga_console_iobase;
 unsigned long vga_console_membase;
 
 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 */
 EXPORT_SYMBOL(ia64_iobase);
 struct io_space io_space[MAX_IO_SPACES];
include/asm-ia64/dma-mapping.h +1 -6
@@ -48,12 +48,7 @@ dma_set_mask (struct device *dev, u64 ma
 	return 0;
 }
 
-static inline int
-dma_get_cache_alignment (void)
-{
-	extern int ia64_max_cacheline_size;
-	return ia64_max_cacheline_size;
-}
+extern int dma_get_cache_alignment(void);
 
 static inline void
 dma_cache_sync (void *vaddr, size_t size, enum dma_data_direction dir)
Signature · 2 lines
John W. Linville
[email protected]
#4 lore raw

Re: [patch 2.6.13] ia64: re-implement dma_get_cache_alignment to avoid EXPORT_SYMBOL

Quoted 5 lines · John W. Linville

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.

looks good to me.

#5 lore raw

Re: [patch 2.6.13] ia64: re-implement dma_get_cache_alignment to avoid EXPORT_SYMBOL

In reply to John W. Linville

arch/ia64/kernel/setup.c unsigned long vga_console_iobase; · line 88

Quoted 8 lines

unsigned long ia64_max_cacheline_size;

arch/ia64/kernel/setup.c +7 -0
+
+int dma_get_cache_alignment(void)
+{
+        return ia64_max_cacheline_size;
+}
+EXPORT_SYMBOL(dma_get_cache_alignment);
+

Are you intentionally returning an "int" instead of an "unsigned long"?

Signature · 1 line
Lion Vollnhals