diff --git a/[refs] b/[refs] index 9c42d72e1367..b71989317455 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d907dd2efd69195f4a5fc584a0eaecc599ca4c2c +refs/heads/master: 99a3eb3845f034eb55640a3da73e5e28349678c6 diff --git a/trunk/include/linux/seqlock.h b/trunk/include/linux/seqlock.h index 46000936f8f1..6b0648cfdffc 100644 --- a/trunk/include/linux/seqlock.h +++ b/trunk/include/linux/seqlock.h @@ -44,8 +44,11 @@ typedef struct { #define SEQLOCK_UNLOCKED \ __SEQLOCK_UNLOCKED(old_style_seqlock_init) -#define seqlock_init(x) \ - do { *(x) = (seqlock_t) __SEQLOCK_UNLOCKED(x); } while (0) +#define seqlock_init(x) \ + do { \ + (x)->sequence = 0; \ + spin_lock_init(&(x)->lock); \ + } while (0) #define DEFINE_SEQLOCK(x) \ seqlock_t x = __SEQLOCK_UNLOCKED(x)