Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-11-05 18:59:58 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Linus Torvalds 2005-09-24 13:49:01 -07:00
commit f50c02831d
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/kernel/io.c
View file

@ -7,7 +7,7 @@
* Copy data from IO memory space to "real" memory space. * Copy data from IO memory space to "real" memory space.
* This needs to be optimized. * 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; unsigned char *t = to;
while (count) { 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. * Copy data from "real" memory space to IO memory space.
* This needs to be optimized. * 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; const unsigned char *f = from;
while (count) { while (count) {
@ -37,7 +37,7 @@ void _memcpy_toio(void __iomem *to, const void *from, size_t count)
* "memset" on IO memory space. * "memset" on IO memory space.
* This needs to be optimized. * 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) { while (count) {
count--; count--;

6
include/asm-arm/io.h
View file

@ -136,9 +136,9 @@ extern void __readwrite_bug(const char *fn);
/* /*
* String version of IO memory access ops: * String version of IO memory access ops:
*/ */
extern void _memcpy_fromio(void *, void __iomem *, size_t); extern void _memcpy_fromio(void *, const volatile void __iomem *, size_t);
extern void _memcpy_toio(void __iomem *, const void *, size_t); extern void _memcpy_toio(volatile void __iomem *, const void *, size_t);
extern void _memset_io(void __iomem *, int, size_t); extern void _memset_io(volatile void __iomem *, int, size_t);
#define mmiowb() #define mmiowb()