From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Gleixner Subject: [patch 10/16] parisc: Replace old style lock init Date: Fri, 06 Nov 2009 22:41:51 -0000 Message-ID: <20091106223806.803538964@linutronix.de> References: <20091106223547.784916750@linutronix.de> Cc: Ingo Molnar , Peter Zijlstra , Kyle McMartin , linux-parisc@vger.kernel.org To: LKML Return-path: List-ID: List-Id: linux-parisc.vger.kernel.org SPIN_LOCK_UNLOCKED is deprecated. Init the per cpu locks at runtime instead. Signed-off-by: Thomas Gleixner Cc: Kyle McMartin Cc: linux-parisc@vger.kernel.org --- arch/parisc/kernel/smp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) Index: linux-2.6/arch/parisc/kernel/smp.c =================================================================== --- linux-2.6.orig/arch/parisc/kernel/smp.c +++ linux-2.6/arch/parisc/kernel/smp.c @@ -60,8 +60,6 @@ static int smp_debug_lvl = 0; #define smp_debug(lvl, ...) do { } while(0) #endif /* DEBUG_SMP */ -DEFINE_SPINLOCK(smp_lock); - volatile struct task_struct *smp_init_current_idle_task; /* track which CPU is booting */ @@ -69,7 +67,7 @@ static volatile int cpu_now_booting __cp static int parisc_max_cpus __cpuinitdata = 1; -DEFINE_PER_CPU(spinlock_t, ipi_lock) = SPIN_LOCK_UNLOCKED; +static DEFINE_PER_CPU(spinlock_t, ipi_lock); enum ipi_message_type { IPI_NOP=0, @@ -438,6 +436,11 @@ void __init smp_prepare_boot_cpu(void) */ void __init smp_prepare_cpus(unsigned int max_cpus) { + int cpu; + + for_each_possible_cpu(cpu) + spin_lock_init(&per_cpu(ipi_lock, cpu)); + init_cpu_present(cpumask_of(0)); parisc_max_cpus = max_cpus; From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933238AbZKFWmP (ORCPT ); Fri, 6 Nov 2009 17:42:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933225AbZKFWmL (ORCPT ); Fri, 6 Nov 2009 17:42:11 -0500 Received: from www.tglx.de ([62.245.132.106]:54047 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933210AbZKFWmG (ORCPT ); Fri, 6 Nov 2009 17:42:06 -0500 Message-Id: <20091106223806.803538964@linutronix.de> User-Agent: quilt/0.47-1 Date: Fri, 06 Nov 2009 22:41:51 -0000 From: Thomas Gleixner To: LKML Cc: Ingo Molnar , Peter Zijlstra , Kyle McMartin , linux-parisc@vger.kernel.org Subject: [patch 10/16] parisc: Replace old style lock init References: <20091106223547.784916750@linutronix.de> Content-Disposition: inline; filename=parisc-replace-old-style-lock-init.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org SPIN_LOCK_UNLOCKED is deprecated. Init the per cpu locks at runtime instead. Signed-off-by: Thomas Gleixner Cc: Kyle McMartin Cc: linux-parisc@vger.kernel.org --- arch/parisc/kernel/smp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) Index: linux-2.6/arch/parisc/kernel/smp.c =================================================================== --- linux-2.6.orig/arch/parisc/kernel/smp.c +++ linux-2.6/arch/parisc/kernel/smp.c @@ -60,8 +60,6 @@ static int smp_debug_lvl = 0; #define smp_debug(lvl, ...) do { } while(0) #endif /* DEBUG_SMP */ -DEFINE_SPINLOCK(smp_lock); - volatile struct task_struct *smp_init_current_idle_task; /* track which CPU is booting */ @@ -69,7 +67,7 @@ static volatile int cpu_now_booting __cp static int parisc_max_cpus __cpuinitdata = 1; -DEFINE_PER_CPU(spinlock_t, ipi_lock) = SPIN_LOCK_UNLOCKED; +static DEFINE_PER_CPU(spinlock_t, ipi_lock); enum ipi_message_type { IPI_NOP=0, @@ -438,6 +436,11 @@ void __init smp_prepare_boot_cpu(void) */ void __init smp_prepare_cpus(unsigned int max_cpus) { + int cpu; + + for_each_possible_cpu(cpu) + spin_lock_init(&per_cpu(ipi_lock, cpu)); + init_cpu_present(cpumask_of(0)); parisc_max_cpus = max_cpus;