Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[PATCH] missing qualifiers in readb() et.al. on ppc
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
authored by Al Viro and committed by Linus Torvalds a3ca066e 66df3bbf
+10
-10
include/asm-ppc/io.h
+10
-10
include/asm-ppc/io.h
···
56
* is actually performed (i.e. the data has come back) before we start
57
* executing any following instructions.
58
*/
59
-
extern inline int in_8(volatile unsigned char __iomem *addr)
60
{
61
int ret;
62
···
72
__asm__ __volatile__("stb%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
73
}
74
75
-
extern inline int in_le16(volatile unsigned short __iomem *addr)
76
{
77
int ret;
78
···
83
return ret;
84
}
85
86
-
extern inline int in_be16(volatile unsigned short __iomem *addr)
87
{
88
int ret;
89
···
104
__asm__ __volatile__("sth%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
105
}
106
107
-
extern inline unsigned in_le32(volatile unsigned __iomem *addr)
108
{
109
unsigned ret;
110
···
115
return ret;
116
}
117
118
-
extern inline unsigned in_be32(volatile unsigned __iomem *addr)
119
{
120
unsigned ret;
121
···
139
#define readb(addr) in_8((volatile u8 *)(addr))
140
#define writeb(b,addr) out_8((volatile u8 *)(addr), (b))
141
#else
142
-
static inline __u8 readb(volatile void __iomem *addr)
143
{
144
return in_8(addr);
145
}
···
150
#endif
151
152
#if defined(CONFIG_APUS)
153
-
static inline __u16 readw(volatile void __iomem *addr)
154
{
155
return *(__force volatile __u16 *)(addr);
156
}
157
-
static inline __u32 readl(volatile void __iomem *addr)
158
{
159
return *(__force volatile __u32 *)(addr);
160
}
···
173
#define writew(b,addr) out_le16((volatile u16 *)(addr),(b))
174
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
175
#else
176
-
static inline __u16 readw(volatile void __iomem *addr)
177
{
178
return in_le16(addr);
179
}
180
-
static inline __u32 readl(volatile void __iomem *addr)
181
{
182
return in_le32(addr);
183
}
···
56
* is actually performed (i.e. the data has come back) before we start
57
* executing any following instructions.
58
*/
59
+
extern inline int in_8(const volatile unsigned char __iomem *addr)
60
{
61
int ret;
62
···
72
__asm__ __volatile__("stb%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
73
}
74
75
+
extern inline int in_le16(const volatile unsigned short __iomem *addr)
76
{
77
int ret;
78
···
83
return ret;
84
}
85
86
+
extern inline int in_be16(const volatile unsigned short __iomem *addr)
87
{
88
int ret;
89
···
104
__asm__ __volatile__("sth%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
105
}
106
107
+
extern inline unsigned in_le32(const volatile unsigned __iomem *addr)
108
{
109
unsigned ret;
110
···
115
return ret;
116
}
117
118
+
extern inline unsigned in_be32(const volatile unsigned __iomem *addr)
119
{
120
unsigned ret;
121
···
139
#define readb(addr) in_8((volatile u8 *)(addr))
140
#define writeb(b,addr) out_8((volatile u8 *)(addr), (b))
141
#else
142
+
static inline __u8 readb(const volatile void __iomem *addr)
143
{
144
return in_8(addr);
145
}
···
150
#endif
151
152
#if defined(CONFIG_APUS)
153
+
static inline __u16 readw(const volatile void __iomem *addr)
154
{
155
return *(__force volatile __u16 *)(addr);
156
}
157
+
static inline __u32 readl(const volatile void __iomem *addr)
158
{
159
return *(__force volatile __u32 *)(addr);
160
}
···
173
#define writew(b,addr) out_le16((volatile u16 *)(addr),(b))
174
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
175
#else
176
+
static inline __u16 readw(const volatile void __iomem *addr)
177
{
178
return in_le16(addr);
179
}
180
+
static inline __u32 readl(const volatile void __iomem *addr)
181
{
182
return in_le32(addr);
183
}