path: root/include/linux/seqlock.h
diff options
authormao, bibo <bibo.mao@intel.com>2006-04-11 12:54:54 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 06:38:57 -0700
commitcde227afe6b997dce08bcfc2aa6e373fb56857b0 (patch)
tree45b0bc04f54a830d0c3cd3a5afb46fcf7679a4dc /include/linux/seqlock.h
parent44b940c299dfaaf25b7aad683ff55cb213502ddd (diff)
[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/linux/seqlock.h')
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index fca9b0fb5b4..5a095572881 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -73,7 +73,7 @@ static inline int write_tryseqlock(seqlock_t *sl)
/* Start of read calculation -- fetch last complete writer token */
-static inline unsigned read_seqbegin(const seqlock_t *sl)
+static __always_inline unsigned read_seqbegin(const seqlock_t *sl)
unsigned ret = sl->sequence;
@@ -88,7 +88,7 @@ static inline unsigned read_seqbegin(const seqlock_t *sl)
* Using xor saves one conditional branch.
-static inline int read_seqretry(const seqlock_t *sl, unsigned iv)
+static __always_inline int read_seqretry(const seqlock_t *sl, unsigned iv)
return (iv & 1) | (sl->sequence ^ iv);