git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull trivial into release branch
[sfrench/cifs-2.6.git]
/
include
/
asm-x86_64
/
io.h
diff --git
a/include/asm-x86_64/io.h
b/include/asm-x86_64/io.h
index cafdfb37f0d8a6db30c5ada019fe52747b880b8b..a05da8a50bfdf28a659df356a0d7a7fbf6342409 100644
(file)
--- a/
include/asm-x86_64/io.h
+++ b/
include/asm-x86_64/io.h
@@
-177,7
+177,7
@@
static inline __u16 __readw(const volatile void __iomem *addr)
{
return *(__force volatile __u16 *)addr;
}
-static inline __u32 __readl(const volatile void __iomem *addr)
+static
__always_
inline __u32 __readl(const volatile void __iomem *addr)
{
return *(__force volatile __u32 *)addr;
}