Re: 2.6.11-mm4

[Paul Mundt]

On Wed, Mar 16, 2005 at 04:06:54AM -0800, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm4/
> 
sh and sh64 need xlate_dev_mem_ptr/xlate_dev_kmem_ptr definitions too..
otherwise end up with:

  LD      .tmp_vmlinux1
drivers/built-in.o(.text+0xf0): In function `read_mem':
mem.c: undefined reference to `xlate_dev_mem_ptr'
drivers/built-in.o(.text+0x210): In function `write_mem':
mem.c: undefined reference to `xlate_dev_mem_ptr'
drivers/built-in.o(.text+0x478): In function `read_kmem':
mem.c: undefined reference to `xlate_dev_kmem_ptr'
drivers/built-in.o(.text+0x628): In function `write_kmem':
mem.c: undefined reference to `xlate_dev_kmem_ptr'
make: *** [.tmp_vmlinux1] Error 1

 include/asm-sh/io.h   |   11 +++++++++++
 include/asm-sh64/io.h |   11 +++++++++++
 2 files changed, 22 insertions(+)

Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

--- linux-sh-2.6.11-mm4.orig/include/asm-sh/io.h	2005-03-17 10:10:56.911518490 +0200
+++ linux-sh-2.6.11-mm4/include/asm-sh/io.h	2005-03-17 10:11:35.164242096 +0200
@@ -295,6 +295,17 @@
 #define dma_cache_wback(_start,_size) \
     __flush_wback_region(_start,_size)
 
+/*
+ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
+ * access
+ */
+#define xlate_dev_mem_ptr(p)	__va(p)
+
+/*
+ * Convert a virtual cached pointer to an uncached pointer
+ */
+#define xlate_dev_kmem_ptr(p)	p
+
 #endif /* __KERNEL__ */
 
 #endif /* __ASM_SH_IO_H */
--- linux-sh-2.6.11-mm4.orig/include/asm-sh64/io.h	2005-03-17 10:11:44.187997628 +0200
+++ linux-sh-2.6.11-mm4/include/asm-sh64/io.h	2005-03-17 10:12:26.554154928 +0200
@@ -235,5 +235,16 @@
 		asm volatile ("ocbwb	%0, 0" : : "r" (s));
 }
 
+/*
+ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
+ * access
+ */
+#define xlate_dev_mem_ptr(p)	__va(p)
+
+/*
+ * Convert a virtual cached pointer to an uncached pointer
+ */
+#define xlate_dev_kmem_ptr(p)	p
+
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH64_IO_H */

Attachment: pgp00000.pgp
Description: PGP signature