summaryrefslogtreecommitdiff
path: root/include/asm-x86_64
diff options
context:
space:
mode:
authormao, bibo <bibo.mao@intel.com>2006-04-11 14:54:54 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 17:38:57 +0400
commitcde227afe6b997dce08bcfc2aa6e373fb56857b0 (patch)
tree45b0bc04f54a830d0c3cd3a5afb46fcf7679a4dc /include/asm-x86_64
parent44b940c299dfaaf25b7aad683ff55cb213502ddd (diff)
downloadlinux-cde227afe6b997dce08bcfc2aa6e373fb56857b0.tar.xz
[PATCH] x86_64: inline function prefix with __always_inline in vsyscall
In vsyscall function do_vgettimeofday(), some functions are declared as inlined, which is a hint for gcc to compile the function inlined but it not forced. Sometimes compiler does not compile the function as inlined, so here inline is replaced by __always_inline prefix. It does not happen in gcc compiler actually, but it possibly happens. Signed-off-by: bibo mao <bibo.mao@intel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r--include/asm-x86_64/io.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/io.h b/include/asm-x86_64/io.h
index cafdfb37f0d8..a05da8a50bfd 100644
--- 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;
}