git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
linux
/
seqlock.h
diff --git
a/include/linux/seqlock.h
b/include/linux/seqlock.h
index
5a09557
..
fca9b0f
100644
(file)
--- 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 */
}
/* Start of read calculation -- fetch last complete writer token */
-static
__always_
inline unsigned read_seqbegin(const seqlock_t *sl)
+static inline unsigned read_seqbegin(const seqlock_t *sl)
{
unsigned ret = sl->sequence;
smp_rmb();
{
unsigned ret = sl->sequence;
smp_rmb();
@@
-88,7
+88,7
@@
static __always_inline unsigned read_seqbegin(const seqlock_t *sl)
*
* Using xor saves one conditional branch.
*/
*
* Using xor saves one conditional branch.
*/
-static
__always_
inline int read_seqretry(const seqlock_t *sl, unsigned iv)
+static inline int read_seqretry(const seqlock_t *sl, unsigned iv)
{
smp_rmb();
return (iv & 1) | (sl->sequence ^ iv);
{
smp_rmb();
return (iv & 1) | (sl->sequence ^ iv);