Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f50c0283 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents ff13f98b d2f60748

arch/arm/kernel/io.c

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 * Copy data from IO memory space to "real" memory space.

 * This needs to be optimized.

 */

void _memcpy_fromio(void *to, void __iomem *from, size_t count)

void _memcpy_fromio(void *to, const volatile void __iomem *from, size_t count)

{

	unsigned char *t = to;

	while (count) {
@@ -22,7 +22,7 @@ void _memcpy_fromio(void *to, void __iomem *from, size_t count) 
 * Copy data from "real" memory space to IO memory space.

 * This needs to be optimized.

 */

void _memcpy_toio(void __iomem *to, const void *from, size_t count)

void _memcpy_toio(volatile void __iomem *to, const void *from, size_t count)

{

	const unsigned char *f = from;

	while (count) {
@@ -37,7 +37,7 @@ void _memcpy_toio(void __iomem *to, const void *from, size_t count) 
 * "memset" on IO memory space.

 * This needs to be optimized.

 */

void _memset_io(void __iomem *dst, int c, size_t count)

void _memset_io(volatile void __iomem *dst, int c, size_t count)

{

	while (count) {

		count--;

include/asm-arm/io.h

+3 −3
Original line number Diff line number Diff line
@@ -136,9 +136,9 @@ extern void __readwrite_bug(const char *fn); 
/*

 * String version of IO memory access ops:

 */

extern void _memcpy_fromio(void *, void __iomem *, size_t);

extern void _memcpy_toio(void __iomem *, const void *, size_t);

extern void _memset_io(void __iomem *, int, size_t);

extern void _memcpy_fromio(void *, const volatile void __iomem *, size_t);

extern void _memcpy_toio(volatile void __iomem *, const void *, size_t);

extern void _memset_io(volatile void __iomem *, int, size_t);



#define mmiowb()