Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4dbe54e authored by Eric Dumazet's avatar Eric Dumazet Committed by Thomas Gleixner
Browse files

seqlock: Get rid of SEQLOCK_UNLOCKED 



All static seqlock should be initialized with the lockdep friendly
__SEQLOCK_UNLOCKED() macro.

Remove legacy SEQLOCK_UNLOCKED() macro.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Cc: David Miller <davem@davemloft.net>
Link: http://lkml.kernel.org/r/%3C1306238888.3026.31.camel%40edumazet-laptop%3E


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d762f438

arch/ia64/kernel/time.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ 
static cycle_t itc_get_cycles(struct clocksource *cs);

static cycle_t itc_get_cycles(struct clocksource *cs);





struct fsyscall_gtod_data_t fsyscall_gtod_data = {

struct fsyscall_gtod_data_t fsyscall_gtod_data = {

	.lock = SEQLOCK_UNLOCKED,

	.lock = __SEQLOCK_UNLOCKED(fsyscall_gtod_data.lock),

};

};





struct itc_jitter_data_t itc_jitter_data;

struct itc_jitter_data_t itc_jitter_data;

arch/x86/kernel/vsyscall_64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ int __vgetcpu_mode __section_vgetcpu_mode; 




struct vsyscall_gtod_data __vsyscall_gtod_data __section_vsyscall_gtod_data =

struct vsyscall_gtod_data __vsyscall_gtod_data __section_vsyscall_gtod_data =

{

{

	.lock = SEQLOCK_UNLOCKED,

	.lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),

	.sysctl_enabled = 1,

	.sysctl_enabled = 1,

};

};

include/linux/seqlock.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -41,9 +41,6 @@ typedef struct { 
#define __SEQLOCK_UNLOCKED(lockname) \

#define __SEQLOCK_UNLOCKED(lockname) \

		 { 0, __SPIN_LOCK_UNLOCKED(lockname) }

		 { 0, __SPIN_LOCK_UNLOCKED(lockname) }





#define SEQLOCK_UNLOCKED \

		 __SEQLOCK_UNLOCKED(old_style_seqlock_init)



#define seqlock_init(x)					\

#define seqlock_init(x)					\

	do {						\

	do {						\

		(x)->sequence = 0;			\

		(x)->sequence = 0;			\

net/ipv4/inet_connection_sock.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ EXPORT_SYMBOL(inet_csk_timer_bug_msg); 
 * This struct holds the first and last local port number.

 * This struct holds the first and last local port number.

 */

 */

struct local_ports sysctl_local_ports __read_mostly = {

struct local_ports sysctl_local_ports __read_mostly = {

	.lock = SEQLOCK_UNLOCKED,

	.lock = __SEQLOCK_UNLOCKED(sysctl_local_ports.lock),

	.range = { 32768, 61000 },

	.range = { 32768, 61000 },

};

};