Merge master.kernel.org:/home/rmk/linux-2.6-arm

+6 -6
+3 -3
arch/arm/kernel/io.c
··· 7 * Copy data from IO memory space to "real" memory space. 8 * This needs to be optimized. 9 */ 10 - void _memcpy_fromio(void *to, void __iomem *from, size_t count) 11 { 12 unsigned char *t = to; 13 while (count) { ··· 22 * Copy data from "real" memory space to IO memory space. 23 * This needs to be optimized. 24 */ 25 - void _memcpy_toio(void __iomem *to, const void *from, size_t count) 26 { 27 const unsigned char *f = from; 28 while (count) { ··· 37 * "memset" on IO memory space. 38 * This needs to be optimized. 39 */ 40 - void _memset_io(void __iomem *dst, int c, size_t count) 41 { 42 while (count) { 43 count--;
··· 7 * Copy data from IO memory space to "real" memory space. 8 * This needs to be optimized. 9 */ 10 + void _memcpy_fromio(void *to, const volatile void __iomem *from, size_t count) 11 { 12 unsigned char *t = to; 13 while (count) { ··· 22 * Copy data from "real" memory space to IO memory space. 23 * This needs to be optimized. 24 */ 25 + void _memcpy_toio(volatile void __iomem *to, const void *from, size_t count) 26 { 27 const unsigned char *f = from; 28 while (count) { ··· 37 * "memset" on IO memory space. 38 * This needs to be optimized. 39 */ 40 + void _memset_io(volatile void __iomem *dst, int c, size_t count) 41 { 42 while (count) { 43 count--;
+3 -3
include/asm-arm/io.h
··· 136 /* 137 * String version of IO memory access ops: 138 */ 139 - extern void _memcpy_fromio(void *, void __iomem *, size_t); 140 - extern void _memcpy_toio(void __iomem *, const void *, size_t); 141 - extern void _memset_io(void __iomem *, int, size_t); 142 143 #define mmiowb() 144
··· 136 /* 137 * String version of IO memory access ops: 138 */ 139 + extern void _memcpy_fromio(void *, const volatile void __iomem *, size_t); 140 + extern void _memcpy_toio(volatile void __iomem *, const void *, size_t); 141 + extern void _memset_io(volatile void __iomem *, int, size_t); 142 143 #define mmiowb() 144