From a0b48bece3b94b6c0b31bd56161a37480cfea463 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 6 Nov 2009 12:41:46 +0000
Subject: [PATCH] --- yaml --- r: 175791 b: refs/heads/master c:
 293cfa44c3a861d63c77923667206356c4756ae0 h: refs/heads/master i:   175789:
 9f1e77516cc1e4e65e19754fec1a35649d3e0838   175787:
 6a5db9f39ae3b420225694369be91375d8151c99   175783:
 fca2f755636af7dd84dd2aef7ef46df1cc003da3   175775:
 52d78d7d542ee49dab9a231d313073f896bf626b v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/powerpc/platforms/iseries/htab.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c5546282e8a1..b7dbc4373dc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b048c7a1d7f65e3e3f77834c03237be9d6d94b7
+refs/heads/master: 293cfa44c3a861d63c77923667206356c4756ae0
diff --git a/trunk/arch/powerpc/platforms/iseries/htab.c b/trunk/arch/powerpc/platforms/iseries/htab.c
index f99c6c4b6985..3ae66ab9d5e7 100644
--- a/trunk/arch/powerpc/platforms/iseries/htab.c
+++ b/trunk/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(unsigned long slot, unsigned long va,
 
 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;