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

Commit 293cfa44 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Benjamin Herrenschmidt
Browse files

powerpc: Replace old style lock initializer 



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

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org
Tested-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 0b048c7a

arch/powerpc/platforms/iseries/htab.c

+6 −2
Original line number Diff line number Diff line
@@ -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;