summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoshinori Sato <ysato@users.sourceforge.jp>2015-06-12 17:57:24 +0900
committerYoshinori Sato <ysato@users.sourceforge.jp>2015-11-08 22:44:42 +0900
commita795239b698d3f7c455b7f8841f5c62d20eefb23 (patch)
tree2d1cd7fd2f5468a46939d9b9a0a3a3900db7d0e9
parent78f02cac9515127efd7dc45e82bbbdb969b3302a (diff)
downloadlinux-stable-a795239b698d3f7c455b7f8841f5c62d20eefb23.tar.gz
linux-stable-a795239b698d3f7c455b7f8841f5c62d20eefb23.tar.bz2
linux-stable-a795239b698d3f7c455b7f8841f5c62d20eefb23.zip
h8300: bit io fix
"WU" constraint required memory address. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
-rw-r--r--arch/h8300/include/asm/io.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/h8300/include/asm/io.h b/arch/h8300/include/asm/io.h
index 1d09b2f2e0fe..bb837cded268 100644
--- a/arch/h8300/include/asm/io.h
+++ b/arch/h8300/include/asm/io.h
@@ -36,20 +36,20 @@ static inline void ctrl_outl(unsigned long b, unsigned long addr)
*(volatile unsigned long *)addr = b;
}
-static inline void ctrl_bclr(int b, unsigned long addr)
+static inline void ctrl_bclr(int b, unsigned char *addr)
{
if (__builtin_constant_p(b))
- __asm__("bclr %1,%0" : : "WU"(addr), "i"(b));
+ __asm__("bclr %1,%0" : "+WU"(*addr): "i"(b));
else
- __asm__("bclr %w1,%0" : : "WU"(addr), "r"(b));
+ __asm__("bclr %w1,%0" : "+WU"(*addr): "r"(b));
}
-static inline void ctrl_bset(int b, unsigned long addr)
+static inline void ctrl_bset(int b, unsigned char *addr)
{
if (__builtin_constant_p(b))
- __asm__("bset %1,%0" : : "WU"(addr), "i"(b));
+ __asm__("bset %1,%0" : "+WU"(*addr): "i"(b));
else
- __asm__("bset %w1,%0" : : "WU"(addr), "r"(b));
+ __asm__("bset %w1,%0" : "+WU"(*addr): "r"(b));
}
#endif /* __KERNEL__ */