Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge master.kernel.org:/home/rmk/linux-2.6-arm
+3
-3
arch/arm/kernel/io.c
+3
-3
arch/arm/kernel/io.c
···
7
7
* Copy data from IO memory space to "real" memory space.
8
8
* This needs to be optimized.
9
9
*/
10
-
void _memcpy_fromio(void *to, void __iomem *from, size_t count)
10
+
void _memcpy_fromio(void *to, const volatile void __iomem *from, size_t count)
11
11
{
12
12
unsigned char *t = to;
13
13
while (count) {
···
22
22
* Copy data from "real" memory space to IO memory space.
23
23
* This needs to be optimized.
24
24
*/
25
-
void _memcpy_toio(void __iomem *to, const void *from, size_t count)
25
+
void _memcpy_toio(volatile void __iomem *to, const void *from, size_t count)
26
26
{
27
27
const unsigned char *f = from;
28
28
while (count) {
···
37
37
* "memset" on IO memory space.
38
38
* This needs to be optimized.
39
39
*/
40
-
void _memset_io(void __iomem *dst, int c, size_t count)
40
+
void _memset_io(volatile void __iomem *dst, int c, size_t count)
41
41
{
42
42
while (count) {
43
43
count--;
+3
-3
include/asm-arm/io.h
+3
-3
include/asm-arm/io.h
···
136
136
/*
137
137
* String version of IO memory access ops:
138
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);
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
142
143
143
#define mmiowb()
144
144