[patch 0/9] locking: Remove the deprecated lock initializers

All of lore.kernel.org
 help / color / mirror / Atom feed

* [patch 0/9] locking: Remove the deprecated lock initializers
@ 2011-01-23 15:16 Thomas Gleixner
  2011-01-23 15:16 ` [patch 1/9] alpha: Replace deprecated spinlock initialization Thomas Gleixner
                   ` (9 more replies)
  0 siblings, 10 replies; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-23 15:16 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Peter Zijlstra

SPIN_LOCK_UNLOCKED and RW_LOCK_UNLOCKED are deprecated since lockdep
was merged. Fixup the last pertinacious users and remove the initializers.

Thanks,

	tglx



^ permalink raw reply	[flat|nested] 21+ messages in thread

* [patch 1/9] alpha: Replace deprecated spinlock initialization
  2011-01-23 15:16 [patch 0/9] locking: Remove the deprecated lock initializers Thomas Gleixner
@ 2011-01-23 15:16 ` Thomas Gleixner
  2011-01-23 17:07     ` Matt Turner
  2011-01-23 15:16 ` [patch 2/9] cris: " Thomas Gleixner
                   ` (8 subsequent siblings)
  9 siblings, 1 reply; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-23 15:16 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Peter Zijlstra, Richard Henderson, linux-alpha

[-- Attachment #1: alpha-replace-deprecated-spinlock-initialization.patch --]
[-- Type: text/plain, Size: 774 bytes --]

SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
instead.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Richard Henderson <rth@twiddle.net>
Cc: linux-alpha@vger.kernel.org
---
 arch/alpha/include/asm/rwsem.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/arch/alpha/include/asm/rwsem.h
===================================================================
--- linux-2.6.orig/arch/alpha/include/asm/rwsem.h
+++ linux-2.6/arch/alpha/include/asm/rwsem.h
@@ -39,7 +39,7 @@ struct rw_semaphore {
 };
 
 #define __RWSEM_INITIALIZER(name) \
-	{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \
+	{ RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock),	\
 	LIST_HEAD_INIT((name).wait_list) }
 
 #define DECLARE_RWSEM(name) \



^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [patch 1/9] alpha: Replace deprecated spinlock initialization
  2011-01-23 15:16 ` [patch 1/9] alpha: Replace deprecated spinlock initialization Thomas Gleixner
@ 2011-01-23 17:07     ` Matt Turner
  0 siblings, 0 replies; 21+ messages in thread
From: Matt Turner @ 2011-01-23 17:07 UTC (permalink / raw)
  To: Thomas Gleixner
  Cc: LKML, Ingo Molnar, Peter Zijlstra, Richard Henderson, linux-alpha

On Sun, Jan 23, 2011 at 3:16 PM, Thomas Gleixner <tglx@linutronix.de> wrote:
> SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
> instead.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: linux-alpha@vger.kernel.org
> ---
>  arch/alpha/include/asm/rwsem.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6/arch/alpha/include/asm/rwsem.h
> ===================================================================
> --- linux-2.6.orig/arch/alpha/include/asm/rwsem.h
> +++ linux-2.6/arch/alpha/include/asm/rwsem.h
> @@ -39,7 +39,7 @@ struct rw_semaphore {
>  };
>
>  #define __RWSEM_INITIALIZER(name) \
> -       { RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \
> +       { RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \
>        LIST_HEAD_INIT((name).wait_list) }
>
>  #define DECLARE_RWSEM(name) \
>
>
> --

Thanks! I'll apply this.

Matt

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [patch 1/9] alpha: Replace deprecated spinlock initialization
@ 2011-01-23 17:07     ` Matt Turner
  0 siblings, 0 replies; 21+ messages in thread
From: Matt Turner @ 2011-01-23 17:07 UTC (permalink / raw)
  To: Thomas Gleixner
  Cc: LKML, Ingo Molnar, Peter Zijlstra, Richard Henderson, linux-alpha

On Sun, Jan 23, 2011 at 3:16 PM, Thomas Gleixner <tglx@linutronix.de> wrote:
> SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
> instead.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: linux-alpha@vger.kernel.org
> ---
>  arch/alpha/include/asm/rwsem.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6/arch/alpha/include/asm/rwsem.h
> ===================================================================
> --- linux-2.6.orig/arch/alpha/include/asm/rwsem.h
> +++ linux-2.6/arch/alpha/include/asm/rwsem.h
> @@ -39,7 +39,7 @@ struct rw_semaphore {
>  };
>
>  #define __RWSEM_INITIALIZER(name) \
> -       { RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \
> +       { RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \
>        LIST_HEAD_INIT((name).wait_list) }
>
>  #define DECLARE_RWSEM(name) \
>
>
> --

Thanks! I'll apply this.

Matt
--
To unsubscribe from this list: send the line "unsubscribe linux-alpha" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [patch 1/9] alpha: Replace deprecated spinlock initialization
  2011-01-23 17:07     ` Matt Turner
  (?)
@ 2011-01-27  7:54     ` Thomas Gleixner
  -1 siblings, 0 replies; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-27  7:54 UTC (permalink / raw)
  To: Matt Turner
  Cc: LKML, Ingo Molnar, Peter Zijlstra, Richard Henderson, linux-alpha

On Sun, 23 Jan 2011, Matt Turner wrote:
> On Sun, Jan 23, 2011 at 3:16 PM, Thomas Gleixner <tglx@linutronix.de> wrote:
> 
> Thanks! I'll apply this.

I take it through core/locking in tip as well, because further
cleanups depend on it. Git will sort out the identical changes.

Thanks,

	tglx

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [patch 2/9] cris: Replace deprecated spinlock initialization
  2011-01-23 15:16 [patch 0/9] locking: Remove the deprecated lock initializers Thomas Gleixner
  2011-01-23 15:16 ` [patch 1/9] alpha: Replace deprecated spinlock initialization Thomas Gleixner
@ 2011-01-23 15:16 ` Thomas Gleixner
  2011-01-24 10:54   ` Jesper Nilsson
  2011-01-23 15:17 ` [patch 3/9] mips: " Thomas Gleixner
                   ` (7 subsequent siblings)
  9 siblings, 1 reply; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-23 15:16 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Peter Zijlstra, Mikael Starvik, linux-cris-kernel

[-- Attachment #1: cris-replace-deprecated-spinlock-initialization.patch --]
[-- Type: text/plain, Size: 881 bytes --]

SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
instead.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Mikael Starvik <starvik@axis.com>
Cc: linux-cris-kernel@axis.com
---
 arch/cris/arch-v32/kernel/smp.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6/arch/cris/arch-v32/kernel/smp.c
===================================================================
--- linux-2.6.orig/arch/cris/arch-v32/kernel/smp.c
+++ linux-2.6/arch/cris/arch-v32/kernel/smp.c
@@ -26,7 +26,9 @@
 #define FLUSH_ALL (void*)0xffffffff
 
 /* Vector of locks used for various atomic operations */
-spinlock_t cris_atomic_locks[] = { [0 ... LOCK_COUNT - 1] = SPIN_LOCK_UNLOCKED};
+spinlock_t cris_atomic_locks[] = {
+	[0 ... LOCK_COUNT - 1] = __SPIN_LOCK_UNLOCKED(cris_atomic_locks)
+};
 
 /* CPU masks */
 cpumask_t phys_cpu_present_map = CPU_MASK_NONE;



^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [patch 2/9] cris: Replace deprecated spinlock initialization
  2011-01-23 15:16 ` [patch 2/9] cris: " Thomas Gleixner
@ 2011-01-24 10:54   ` Jesper Nilsson
  2011-01-27  7:54     ` Thomas Gleixner
  0 siblings, 1 reply; 21+ messages in thread
From: Jesper Nilsson @ 2011-01-24 10:54 UTC (permalink / raw)
  To: Thomas Gleixner; +Cc: LKML, Peter Zijlstra, Ingo Molnar, linux-cris-kernel

On Sun, Jan 23, 2011 at 04:16:55PM +0100, Thomas Gleixner wrote:
> SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
> instead.
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: linux-cris-kernel@axis.com

Thanks, I'll add this to the CRIS-tree.

/^JN - Jesper Nilsson
-- 
               Jesper Nilsson -- jesper.nilsson@axis.com

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [patch 2/9] cris: Replace deprecated spinlock initialization
  2011-01-24 10:54   ` Jesper Nilsson
@ 2011-01-27  7:54     ` Thomas Gleixner
  0 siblings, 0 replies; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-27  7:54 UTC (permalink / raw)
  To: Jesper Nilsson; +Cc: LKML, Peter Zijlstra, Ingo Molnar, linux-cris-kernel

On Mon, 24 Jan 2011, Jesper Nilsson wrote:

> On Sun, Jan 23, 2011 at 04:16:55PM +0100, Thomas Gleixner wrote:
> > SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
> > instead.
> > 
> > Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Mikael Starvik <starvik@axis.com>
> > Cc: linux-cris-kernel@axis.com
> 
> Thanks, I'll add this to the CRIS-tree.

I take it through core/locking in tip as well, because further
cleanups depend on it. Git will sort out the identical changes.

Thanks,

        tglx

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [patch 3/9] mips: Replace deprecated spinlock initialization
  2011-01-23 15:16 [patch 0/9] locking: Remove the deprecated lock initializers Thomas Gleixner
  2011-01-23 15:16 ` [patch 1/9] alpha: Replace deprecated spinlock initialization Thomas Gleixner
  2011-01-23 15:16 ` [patch 2/9] cris: " Thomas Gleixner
@ 2011-01-23 15:17 ` Thomas Gleixner
  2011-01-24 12:42   ` Ralf Baechle
  2011-01-23 15:17   ` Thomas Gleixner
                   ` (6 subsequent siblings)
  9 siblings, 1 reply; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-23 15:17 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Peter Zijlstra, Ralf Baechle, linux-mips

[-- Attachment #1: mips-replace-deprecated-spinlock-initialization.patch --]
[-- Type: text/plain, Size: 890 bytes --]

SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
instead.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---
 arch/mips/kernel/vpe.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/mips/kernel/vpe.c
===================================================================
--- linux-2.6.orig/arch/mips/kernel/vpe.c
+++ linux-2.6/arch/mips/kernel/vpe.c
@@ -148,9 +148,9 @@ struct {
 	spinlock_t tc_list_lock;
 	struct list_head tc_list;	/* Thread contexts */
 } vpecontrol = {
-	.vpe_list_lock	= SPIN_LOCK_UNLOCKED,
+	.vpe_list_lock	= __SPIN_LOCK_UNLOCKED(vpe_list_lock),
 	.vpe_list	= LIST_HEAD_INIT(vpecontrol.vpe_list),
-	.tc_list_lock	= SPIN_LOCK_UNLOCKED,
+	.tc_list_lock	= __SPIN_LOCK_UNLOCKED(tc_list_lock),
 	.tc_list	= LIST_HEAD_INIT(vpecontrol.tc_list)
 };
 



^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [patch 3/9] mips: Replace deprecated spinlock initialization
  2011-01-23 15:17 ` [patch 3/9] mips: " Thomas Gleixner
@ 2011-01-24 12:42   ` Ralf Baechle
  2011-01-27  7:54     ` Thomas Gleixner
  0 siblings, 1 reply; 21+ messages in thread
From: Ralf Baechle @ 2011-01-24 12:42 UTC (permalink / raw)
  To: Thomas Gleixner; +Cc: LKML, Ingo Molnar, Peter Zijlstra, linux-mips

Thanks, applied.

  Ralf

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [patch 3/9] mips: Replace deprecated spinlock initialization
  2011-01-24 12:42   ` Ralf Baechle
@ 2011-01-27  7:54     ` Thomas Gleixner
  0 siblings, 0 replies; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-27  7:54 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: LKML, Ingo Molnar, Peter Zijlstra, linux-mips

On Mon, 24 Jan 2011, Ralf Baechle wrote:

> Thanks, applied.
> 
>   Ralf
> 

I take it through core/locking in tip as well, because further
cleanups depend on it. Git will sort out the identical changes.

Thanks,

        tglx

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [patch 4/9] sparc: Replace deprecated spinlock initialization
  2011-01-23 15:16 [patch 0/9] locking: Remove the deprecated lock initializers Thomas Gleixner
@ 2011-01-23 15:17   ` Thomas Gleixner
  2011-01-23 15:16 ` [patch 2/9] cris: " Thomas Gleixner
                     ` (8 subsequent siblings)
  9 siblings, 0 replies; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-23 15:17 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Peter Zijlstra, David S. Miller, sparclinux

[-- Attachment #1: sparc-replace-deprecated-spinlock-initialization.patch --]
[-- Type: text/plain, Size: 787 bytes --]

SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
instead.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
---
 arch/sparc/lib/atomic32.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/arch/sparc/lib/atomic32.c
===================================================================
--- linux-2.6.orig/arch/sparc/lib/atomic32.c
+++ linux-2.6/arch/sparc/lib/atomic32.c
@@ -16,7 +16,7 @@
 #define ATOMIC_HASH(a)	(&__atomic_hash[(((unsigned long)a)>>8) & (ATOMIC_HASH_SIZE-1)])
 
 spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] = {
-	[0 ... (ATOMIC_HASH_SIZE-1)] = SPIN_LOCK_UNLOCKED
+	[0 ... (ATOMIC_HASH_SIZE-1)] = __SPIN_LOCK_UNLOCKED(__atomic_hash)
 };
 
 #else /* SMP */



^ permalink raw reply	[flat|nested] 21+ messages in thread

* [patch 4/9] sparc: Replace deprecated spinlock initialization
@ 2011-01-23 15:17   ` Thomas Gleixner
  0 siblings, 0 replies; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-23 15:17 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Peter Zijlstra, David S. Miller, sparclinux

SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
instead.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
---
 arch/sparc/lib/atomic32.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/arch/sparc/lib/atomic32.c
=================================--- linux-2.6.orig/arch/sparc/lib/atomic32.c
+++ linux-2.6/arch/sparc/lib/atomic32.c
@@ -16,7 +16,7 @@
 #define ATOMIC_HASH(a)	(&__atomic_hash[(((unsigned long)a)>>8) & (ATOMIC_HASH_SIZE-1)])
 
 spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] = {
-	[0 ... (ATOMIC_HASH_SIZE-1)] = SPIN_LOCK_UNLOCKED
+	[0 ... (ATOMIC_HASH_SIZE-1)] = __SPIN_LOCK_UNLOCKED(__atomic_hash)
 };
 
 #else /* SMP */



^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [patch 4/9] sparc: Replace deprecated spinlock initialization
  2011-01-23 15:17   ` Thomas Gleixner
@ 2011-01-23 19:54     ` David Miller
  -1 siblings, 0 replies; 21+ messages in thread
From: David Miller @ 2011-01-23 19:54 UTC (permalink / raw)
  To: tglx; +Cc: linux-kernel, mingo, peterz, sparclinux

From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 23 Jan 2011 15:17:04 -0000

> SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
> instead.
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Acked-by: David S. Miller <davem@davemloft.net>

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [patch 4/9] sparc: Replace deprecated spinlock initialization
@ 2011-01-23 19:54     ` David Miller
  0 siblings, 0 replies; 21+ messages in thread
From: David Miller @ 2011-01-23 19:54 UTC (permalink / raw)
  To: tglx; +Cc: linux-kernel, mingo, peterz, sparclinux

From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 23 Jan 2011 15:17:04 -0000

> SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
> instead.
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Acked-by: David S. Miller <davem@davemloft.net>

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [patch 5/9] um: Replace deprecated spinlock initialization
  2011-01-23 15:16 [patch 0/9] locking: Remove the deprecated lock initializers Thomas Gleixner
                   ` (3 preceding siblings ...)
  2011-01-23 15:17   ` Thomas Gleixner
@ 2011-01-23 15:17 ` Thomas Gleixner
  2011-01-23 15:17 ` [patch 6/9] xtensa: " Thomas Gleixner
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-23 15:17 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Peter Zijlstra, Jeff Dike

[-- Attachment #1: um-replace-deprecated-spinlock-initialization.patch --]
[-- Type: text/plain, Size: 704 bytes --]

SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
instead.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jeff Dike <jdike@addtoit.com>
---
 arch/um/drivers/ubd_kern.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/arch/um/drivers/ubd_kern.c
===================================================================
--- linux-2.6.orig/arch/um/drivers/ubd_kern.c
+++ linux-2.6/arch/um/drivers/ubd_kern.c
@@ -185,7 +185,7 @@ struct ubd {
 	.no_cow =               0, \
 	.shared =		0, \
 	.cow =			DEFAULT_COW, \
-	.lock =			SPIN_LOCK_UNLOCKED,	\
+	.lock =			__SPIN_LOCK_UNLOCKED(ubd_devs.lock), \
 	.request =		NULL, \
 	.start_sg =		0, \
 	.end_sg =		0, \



^ permalink raw reply	[flat|nested] 21+ messages in thread

* [patch 6/9] xtensa: Replace deprecated spinlock initialization
  2011-01-23 15:16 [patch 0/9] locking: Remove the deprecated lock initializers Thomas Gleixner
                   ` (4 preceding siblings ...)
  2011-01-23 15:17 ` [patch 5/9] um: " Thomas Gleixner
@ 2011-01-23 15:17 ` Thomas Gleixner
  2011-01-23 15:17 ` [patch 7/9] kthread: " Thomas Gleixner
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-23 15:17 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Peter Zijlstra, Chris Zankel

[-- Attachment #1: xtensa-replace-deprecated-spinlock-initialization.patch --]
[-- Type: text/plain, Size: 745 bytes --]

SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
instead.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Chris Zankel <chris@zankel.net>
---
 arch/xtensa/include/asm/rwsem.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/arch/xtensa/include/asm/rwsem.h
===================================================================
--- linux-2.6.orig/arch/xtensa/include/asm/rwsem.h
+++ linux-2.6/arch/xtensa/include/asm/rwsem.h
@@ -38,7 +38,7 @@ struct rw_semaphore {
 };
 
 #define __RWSEM_INITIALIZER(name) \
-	{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \
+	{ RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock),	\
 	  LIST_HEAD_INIT((name).wait_list) }
 
 #define DECLARE_RWSEM(name)		\



^ permalink raw reply	[flat|nested] 21+ messages in thread

* [patch 7/9] kthread: Replace deprecated spinlock initialization
  2011-01-23 15:16 [patch 0/9] locking: Remove the deprecated lock initializers Thomas Gleixner
                   ` (5 preceding siblings ...)
  2011-01-23 15:17 ` [patch 6/9] xtensa: " Thomas Gleixner
@ 2011-01-23 15:17 ` Thomas Gleixner
  2011-01-23 15:17 ` [patch 8/9] cred: " Thomas Gleixner
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-23 15:17 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Peter Zijlstra

[-- Attachment #1: kthread-replace-deprecated-spinlock-initialization.patch --]
[-- Type: text/plain, Size: 642 bytes --]

SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
instead.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 include/linux/kthread.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/include/linux/kthread.h
===================================================================
--- linux-2.6.orig/include/linux/kthread.h
+++ linux-2.6/include/linux/kthread.h
@@ -64,7 +64,7 @@ struct kthread_work {
 };
 
 #define KTHREAD_WORKER_INIT(worker)	{				\
-	.lock = SPIN_LOCK_UNLOCKED,					\
+	.lock = __SPIN_LOCK_UNLOCKED((worker).lock),			\
 	.work_list = LIST_HEAD_INIT((worker).work_list),		\
 	}
 



^ permalink raw reply	[flat|nested] 21+ messages in thread

* [patch 8/9] cred: Replace deprecated spinlock initialization
  2011-01-23 15:16 [patch 0/9] locking: Remove the deprecated lock initializers Thomas Gleixner
                   ` (6 preceding siblings ...)
  2011-01-23 15:17 ` [patch 7/9] kthread: " Thomas Gleixner
@ 2011-01-23 15:17 ` Thomas Gleixner
  2011-01-23 15:17 ` [patch 9/9] locking: Remove deprecated lock initializers Thomas Gleixner
  2011-01-24  9:46 ` [patch 0/9] locking: Remove the " Peter Zijlstra
  9 siblings, 0 replies; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-23 15:17 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Peter Zijlstra

[-- Attachment #1: cred-replace-deprecated-spinlock-initialization.patch --]
[-- Type: text/plain, Size: 607 bytes --]

SPIN_LOCK_UNLOCK is deprecated. Use the lockdep capable variant
instead.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 kernel/cred.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/kernel/cred.c
===================================================================
--- linux-2.6.orig/kernel/cred.c
+++ linux-2.6/kernel/cred.c
@@ -35,7 +35,7 @@ static struct kmem_cache *cred_jar;
 static struct thread_group_cred init_tgcred = {
 	.usage	= ATOMIC_INIT(2),
 	.tgid	= 0,
-	.lock	= SPIN_LOCK_UNLOCKED,
+	.lock	= __SPIN_LOCK_UNLOCKED(init_cred.tgcred.lock),
 };
 #endif
 



^ permalink raw reply	[flat|nested] 21+ messages in thread

* [patch 9/9] locking: Remove deprecated lock initializers
  2011-01-23 15:16 [patch 0/9] locking: Remove the deprecated lock initializers Thomas Gleixner
                   ` (7 preceding siblings ...)
  2011-01-23 15:17 ` [patch 8/9] cred: " Thomas Gleixner
@ 2011-01-23 15:17 ` Thomas Gleixner
  2011-01-24  9:46 ` [patch 0/9] locking: Remove the " Peter Zijlstra
  9 siblings, 0 replies; 21+ messages in thread
From: Thomas Gleixner @ 2011-01-23 15:17 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Peter Zijlstra

[-- Attachment #1: locking-remove-deprecated-lock-initializers.patch --]
[-- Type: text/plain, Size: 3421 bytes --]

Last users are gone. Remove the leftovers.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 Documentation/spinlocks.txt    |   24 +-----------------------
 include/linux/rwlock_types.h   |    8 --------
 include/linux/spinlock_types.h |    8 --------
 scripts/checkpatch.pl          |    5 -----
 4 files changed, 1 insertion(+), 44 deletions(-)

Index: linux-2.6/Documentation/spinlocks.txt
===================================================================
--- linux-2.6.orig/Documentation/spinlocks.txt
+++ linux-2.6/Documentation/spinlocks.txt
@@ -86,7 +86,7 @@ to change the variables it has to get an
 
 The routines look the same as above:
 
-   rwlock_t xxx_lock = RW_LOCK_UNLOCKED;
+   rwlock_t xxx_lock = __RW_LOCK_UNLOCKED(xxx_lock);
 
 	unsigned long flags;
 
@@ -196,25 +196,3 @@ appropriate:
 
 For static initialization, use DEFINE_SPINLOCK() / DEFINE_RWLOCK() or
 __SPIN_LOCK_UNLOCKED() / __RW_LOCK_UNLOCKED() as appropriate.
-
-SPIN_LOCK_UNLOCKED and RW_LOCK_UNLOCKED are deprecated.  These interfere
-with lockdep state tracking.
-
-Most of the time, you can simply turn:
-	static spinlock_t xxx_lock = SPIN_LOCK_UNLOCKED;
-into:
-	static DEFINE_SPINLOCK(xxx_lock);
-
-Static structure member variables go from:
-
-	struct foo bar {
-		.lock	=	SPIN_LOCK_UNLOCKED;
-	};
-
-to:
-
-	struct foo bar {
-		.lock	=	__SPIN_LOCK_UNLOCKED(bar.lock);
-	};
-
-Declaration of static rw_locks undergo a similar transformation.
Index: linux-2.6/include/linux/rwlock_types.h
===================================================================
--- linux-2.6.orig/include/linux/rwlock_types.h
+++ linux-2.6/include/linux/rwlock_types.h
@@ -43,14 +43,6 @@ typedef struct {
 				RW_DEP_MAP_INIT(lockname) }
 #endif
 
-/*
- * RW_LOCK_UNLOCKED defeat lockdep state tracking and is hence
- * deprecated.
- *
- * Please use DEFINE_RWLOCK() or __RW_LOCK_UNLOCKED() as appropriate.
- */
-#define RW_LOCK_UNLOCKED	__RW_LOCK_UNLOCKED(old_style_rw_init)
-
 #define DEFINE_RWLOCK(x)	rwlock_t x = __RW_LOCK_UNLOCKED(x)
 
 #endif /* __LINUX_RWLOCK_TYPES_H */
Index: linux-2.6/include/linux/spinlock_types.h
===================================================================
--- linux-2.6.orig/include/linux/spinlock_types.h
+++ linux-2.6/include/linux/spinlock_types.h
@@ -81,14 +81,6 @@ typedef struct spinlock {
 #define __SPIN_LOCK_UNLOCKED(lockname) \
 	(spinlock_t ) __SPIN_LOCK_INITIALIZER(lockname)
 
-/*
- * SPIN_LOCK_UNLOCKED defeats lockdep state tracking and is hence
- * deprecated.
- * Please use DEFINE_SPINLOCK() or __SPIN_LOCK_UNLOCKED() as
- * appropriate.
- */
-#define SPIN_LOCK_UNLOCKED	__SPIN_LOCK_UNLOCKED(old_style_spin_init)
-
 #define DEFINE_SPINLOCK(x)	spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
 
 #include <linux/rwlock_types.h>
Index: linux-2.6/scripts/checkpatch.pl
===================================================================
--- linux-2.6.orig/scripts/checkpatch.pl
+++ linux-2.6/scripts/checkpatch.pl
@@ -2654,11 +2654,6 @@ sub process {
 			WARN("Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);
 		}
 
-# SPIN_LOCK_UNLOCKED & RW_LOCK_UNLOCKED are deprecated
-		if ($line =~ /\b(SPIN_LOCK_UNLOCKED|RW_LOCK_UNLOCKED)/) {
-			ERROR("Use of $1 is deprecated: see Documentation/spinlocks.txt\n" . $herecurr);
-		}
-
 # warn about #if 0
 		if ($line =~ /^.\s*\#\s*if\s+0\b/) {
 			CHK("if this code is redundant consider removing it\n" .



^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [patch 0/9] locking: Remove the deprecated lock initializers
  2011-01-23 15:16 [patch 0/9] locking: Remove the deprecated lock initializers Thomas Gleixner
                   ` (8 preceding siblings ...)
  2011-01-23 15:17 ` [patch 9/9] locking: Remove deprecated lock initializers Thomas Gleixner
@ 2011-01-24  9:46 ` Peter Zijlstra
  9 siblings, 0 replies; 21+ messages in thread
From: Peter Zijlstra @ 2011-01-24  9:46 UTC (permalink / raw)
  To: Thomas Gleixner; +Cc: LKML, Ingo Molnar

On Sun, 2011-01-23 at 15:16 +0000, Thomas Gleixner wrote:
> SPIN_LOCK_UNLOCKED and RW_LOCK_UNLOCKED are deprecated since lockdep
> was merged. Fixup the last pertinacious users and remove the initializers.

Nice!,

Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>

^ permalink raw reply	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2011-01-27  7:55 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-23 15:16 [patch 0/9] locking: Remove the deprecated lock initializers Thomas Gleixner
2011-01-23 15:16 ` [patch 1/9] alpha: Replace deprecated spinlock initialization Thomas Gleixner
2011-01-23 17:07   ` Matt Turner
2011-01-23 17:07     ` Matt Turner
2011-01-27  7:54     ` Thomas Gleixner
2011-01-23 15:16 ` [patch 2/9] cris: " Thomas Gleixner
2011-01-24 10:54   ` Jesper Nilsson
2011-01-27  7:54     ` Thomas Gleixner
2011-01-23 15:17 ` [patch 3/9] mips: " Thomas Gleixner
2011-01-24 12:42   ` Ralf Baechle
2011-01-27  7:54     ` Thomas Gleixner
2011-01-23 15:17 ` [patch 4/9] sparc: " Thomas Gleixner
2011-01-23 15:17   ` Thomas Gleixner
2011-01-23 19:54   ` David Miller
2011-01-23 19:54     ` David Miller
2011-01-23 15:17 ` [patch 5/9] um: " Thomas Gleixner
2011-01-23 15:17 ` [patch 6/9] xtensa: " Thomas Gleixner
2011-01-23 15:17 ` [patch 7/9] kthread: " Thomas Gleixner
2011-01-23 15:17 ` [patch 8/9] cred: " Thomas Gleixner
2011-01-23 15:17 ` [patch 9/9] locking: Remove deprecated lock initializers Thomas Gleixner
2011-01-24  9:46 ` [patch 0/9] locking: Remove the " Peter Zijlstra

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.