From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: Ingo Molnar <mingo@elte.hu>, Peter Zijlstra <peterz@infradead.org>, Kyle McMartin <kyle@mcmartin.ca>, linux-parisc@vger.kernel.org Subject: [patch 10/16] parisc: Replace old style lock init Date: Fri, 06 Nov 2009 22:41:51 -0000 [thread overview] Message-ID: <20091106223806.803538964@linutronix.de> (raw) In-Reply-To: 20091106223547.784916750@linutronix.de SPIN_LOCK_UNLOCKED is deprecated. Init the per cpu locks at runtime instead. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Kyle McMartin <kyle@mcmartin.ca> 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;
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: Ingo Molnar <mingo@elte.hu>, Peter Zijlstra <peterz@infradead.org>, Kyle McMartin <kyle@mcmartin.ca>, linux-parisc@vger.kernel.org Subject: [patch 10/16] parisc: Replace old style lock init Date: Fri, 06 Nov 2009 22:41:51 -0000 [thread overview] Message-ID: <20091106223806.803538964@linutronix.de> (raw) In-Reply-To: 20091106223547.784916750@linutronix.de [-- Attachment #1: parisc-replace-old-style-lock-init.patch --] [-- Type: text/plain, Size: 1266 bytes --] SPIN_LOCK_UNLOCKED is deprecated. Init the per cpu locks at runtime instead. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Kyle McMartin <kyle@mcmartin.ca> 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;
next prev parent reply other threads:[~2009-11-06 22:41 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 ` [patch 09/16] powerpc: Replace old style lock initializer Thomas Gleixner 2009-11-06 22:41 ` 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 ` Thomas Gleixner [this message] 2009-11-06 22:41 ` [patch 10/16] parisc: Replace old style lock init 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.803538964@linutronix.de \ --to=tglx@linutronix.de \ --cc=kyle@mcmartin.ca \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-parisc@vger.kernel.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: linkBe 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.