[PATCH] x86_64: Move memset_io out of line to avoid warnings.

Move memset_io out of line to avoid warnings.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/x86_64/lib/io.c b/arch/x86_64/lib/io.c
index df68a2623736f6b3e6adc818de7653bf58fa33ae..87b4a4e180391230156d0d4bd84cbda325d57810 100644 (file)
--- a/arch/x86_64/lib/io.c
+++ b/arch/x86_64/lib/io.c
@@ -13,3 +13,11 @@ void __memcpy_fromio(void *dst,unsigned long src,unsigned len)
        __inline_memcpy(dst,(const void *) src,len);
 }
 EXPORT_SYMBOL(__memcpy_fromio);
+
+void memset_io(volatile void __iomem *a, int b, size_t c)
+{
+       /* XXX: memset can mangle the IO patterns quite a bit.
+          perhaps it would be better to use a dumb one */
+       memset((void *)a,b,c);
+}
+EXPORT_SYMBOL(memset_io);

diff --git a/include/asm-x86_64/io.h b/include/asm-x86_64/io.h
index ce379aee73552b8f158401ace79d84c8d789a42a..734db492e8894f604ba86f93560aa8f60d68e40b 100644 (file)
--- a/include/asm-x86_64/io.h
+++ b/include/asm-x86_64/io.h
@@ -260,10 +260,8 @@ static inline void memcpy_toio(volatile void __iomem *to, const void *from, unsi
 {
        __memcpy_toio((unsigned long)to,from,len);
 }
-static inline void memset_io(volatile void __iomem *a, int b, size_t c)
-{
-       memset((__force void *)a,b,c);
-}
+
+void memset_io(volatile void __iomem *a, int b, size_t c);
 
 /*
  * ISA space is 'always mapped' on a typical x86 system, no need to