All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>,
	Peter Zijlstra <peterz@infradead.org>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	linuxppc-dev@ozlabs.org
Subject: [patch 09/16] powerpc: Replace old style lock initializer
Date: Fri, 06 Nov 2009 22:41:46 -0000	[thread overview]
Message-ID: <20091106223806.762624109@linutronix.de> (raw)
In-Reply-To: 20091106223547.784916750@linutronix.de

[-- Attachment #1: power-replace-old-style-lock-init.patch --]
[-- Type: text/plain, Size: 1192 bytes --]

SPIN_LOCK_UNLOCKED is deprecated. Init the lock array at runtime
instead.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org
---
 arch/powerpc/platforms/iseries/htab.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/powerpc/platforms/iseries/htab.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/iseries/htab.c
+++ linux-2.6/arch/powerpc/platforms/iseries/htab.c
@@ -19,8 +19,7 @@
 
 #include "call_hpt.h"
 
-static spinlock_t iSeries_hlocks[64] __cacheline_aligned_in_smp =
-	{ [0 ... 63] = SPIN_LOCK_UNLOCKED};
+static spinlock_t iSeries_hlocks[64] __cacheline_aligned_in_smp;
 
 /*
  * Very primitive algorithm for picking up a lock
@@ -245,6 +244,11 @@ static void iSeries_hpte_invalidate(unsi
 
 void __init hpte_init_iSeries(void)
 {
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(iSeries_hlocks); i++)
+		spin_lock_init(&iSeries_hlocks[i]);
+
 	ppc_md.hpte_invalidate	= iSeries_hpte_invalidate;
 	ppc_md.hpte_updatepp	= iSeries_hpte_updatepp;
 	ppc_md.hpte_updateboltedpp = iSeries_hpte_updateboltedpp;



WARNING: multiple messages have this Message-ID (diff)
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@elte.hu>,
	linuxppc-dev@ozlabs.org
Subject: [patch 09/16] powerpc: Replace old style lock initializer
Date: Fri, 06 Nov 2009 22:41:46 -0000	[thread overview]
Message-ID: <20091106223806.762624109@linutronix.de> (raw)
In-Reply-To: 20091106223547.784916750@linutronix.de

SPIN_LOCK_UNLOCKED is deprecated. Init the lock array at runtime
instead.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org
---
 arch/powerpc/platforms/iseries/htab.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/powerpc/platforms/iseries/htab.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/iseries/htab.c
+++ linux-2.6/arch/powerpc/platforms/iseries/htab.c
@@ -19,8 +19,7 @@
 
 #include "call_hpt.h"
 
-static spinlock_t iSeries_hlocks[64] __cacheline_aligned_in_smp =
-	{ [0 ... 63] = SPIN_LOCK_UNLOCKED};
+static spinlock_t iSeries_hlocks[64] __cacheline_aligned_in_smp;
 
 /*
  * Very primitive algorithm for picking up a lock
@@ -245,6 +244,11 @@ static void iSeries_hpte_invalidate(unsi
 
 void __init hpte_init_iSeries(void)
 {
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(iSeries_hlocks); i++)
+		spin_lock_init(&iSeries_hlocks[i]);
+
 	ppc_md.hpte_invalidate	= iSeries_hpte_invalidate;
 	ppc_md.hpte_updatepp	= iSeries_hpte_updatepp;
 	ppc_md.hpte_updateboltedpp = iSeries_hpte_updateboltedpp;

  parent reply	other threads:[~2009-11-06 22:43 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-06 22:41 [patch 00/16] Remove old style lock initializers Thomas Gleixner
2009-11-06 22:41 ` [patch 01/16] arm: Replace old style lock initializer Thomas Gleixner
2009-11-06 22:41 ` [patch 02/16] mips: Replace old style spin " Thomas Gleixner
2009-11-06 22:41 ` [patch 03/16] net: Replace old style " Thomas Gleixner
2009-11-07  6:17   ` David Miller
2009-11-06 22:41 ` [patch 04/16] cred: " Thomas Gleixner
2009-11-06 22:41 ` [patch 05/16] pci: " Thomas Gleixner
2009-11-06 23:06   ` Jesse Barnes
2009-11-06 22:41 ` [patch 06/16] sound: " Thomas Gleixner
2009-11-07  9:20   ` Takashi Iwai
2009-11-06 22:41 ` [patch 07/16] um: " Thomas Gleixner
2009-11-09  2:13   ` Américo Wang
2009-11-06 22:41 ` [patch 08/16] sparc: Make atomic locks raw Thomas Gleixner
2009-11-06 22:41   ` Thomas Gleixner
2009-11-07  6:16   ` David Miller
2009-11-07  6:16     ` David Miller
2009-11-06 22:41 ` Thomas Gleixner [this message]
2009-11-06 22:41   ` [patch 09/16] powerpc: Replace old style lock initializer Thomas Gleixner
2009-11-06 22:55   ` Benjamin Herrenschmidt
2009-11-06 22:55     ` Benjamin Herrenschmidt
2009-11-08  7:55     ` Stephen Rothwell
2009-11-08  7:55       ` Stephen Rothwell
2009-11-09  5:15     ` Stephen Rothwell
2009-11-09  5:15       ` Stephen Rothwell
2009-11-09  8:53       ` Benjamin Herrenschmidt
2009-11-09  8:53         ` Benjamin Herrenschmidt
2009-11-06 22:41 ` [patch 10/16] parisc: Replace old style lock init Thomas Gleixner
2009-11-06 22:41   ` Thomas Gleixner
2009-11-08  5:06   ` Kyle McMartin
2009-11-08 16:11     ` Thomas Gleixner
2009-11-06 22:41 ` [patch 11/16] alpha: Replace old style lock initializer Thomas Gleixner
2009-11-06 22:42 ` [patch 12/16] ia64: " Thomas Gleixner
2009-11-06 22:42   ` Thomas Gleixner
2009-11-06 22:42 ` [patch 13/16] sh: " Thomas Gleixner
2009-11-06 22:42   ` Thomas Gleixner
2009-11-09  1:49   ` Paul Mundt
2009-11-09  1:49     ` Paul Mundt
2009-11-06 22:42 ` [patch 14/16] sparc: " Thomas Gleixner
2009-11-06 22:42   ` Thomas Gleixner
2009-11-07  6:18   ` David Miller
2009-11-07  6:18     ` David Miller
2009-11-07  6:20     ` David Miller
2009-11-07  6:20       ` David Miller
2009-11-07 12:16       ` Thomas Gleixner
2009-11-07 12:16         ` Thomas Gleixner
2009-11-08  6:45         ` David Miller
2009-11-08  6:45           ` David Miller
2009-11-06 22:42 ` [patch 15/16] xtensa: " Thomas Gleixner
2009-11-10  9:34   ` Chris Zankel
2009-11-06 22:42 ` [patch 16/16] locking: Remove old style lock initializers Thomas Gleixner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091106223806.762624109@linutronix.de \
    --to=tglx@linutronix.de \
    --cc=benh@kernel.crashing.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.