diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-09-03 12:01:14 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-09-03 12:01:14 +0800 |
| commit | e3e20674f6310c717449db024723218f3adbc6d2 (patch) | |
| tree | 80d066b990b9cdce56b75467d9ef3c94897d12a6 /arch/x86/include | |
| parent | 7eab57b43413b6e1fda7e2c5c81ad8b02bcb25d0 (diff) | |
| parent | e52da3428a8bc736746ab41915a61b1af44cf79e (diff) | |
Merge tag 'v3.18.69' into linux-linaro-lsk-v3.18
This is the 3.18.69 stable release
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index b8237d8a1e0c..a882087d34f2 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -297,13 +297,13 @@ static inline unsigned type in##bwl##_p(int port) \ static inline void outs##bwl(int port, const void *addr, unsigned long count) \ { \ asm volatile("rep; outs" #bwl \ - : "+S"(addr), "+c"(count) : "d"(port)); \ + : "+S"(addr), "+c"(count) : "d"(port) : "memory"); \ } \ \ static inline void ins##bwl(int port, void *addr, unsigned long count) \ { \ asm volatile("rep; ins" #bwl \ - : "+D"(addr), "+c"(count) : "d"(port)); \ + : "+D"(addr), "+c"(count) : "d"(port) : "memory"); \ } BUILDIO(b, b, char) |