| Submitter | Thomas Gleixner |
|---|---|
| Date | 2009-11-06 22:41:51 |
| Message ID | <20091106223806.803538964@linutronix.de> |
| Download | mbox | patch |
| Permalink | /patch/58233/ |
| State | New |
| Headers | show |
Comments
On Fri, Nov 06, 2009 at 10:41:51PM -0000, Thomas Gleixner wrote: > 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 applied with one nit. > > -DEFINE_SPINLOCK(smp_lock); > - You forgot to mention this was unused. :) Confused me for a while. cheers, Kyle > 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; > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Sun, 8 Nov 2009, Kyle McMartin wrote: > On Fri, Nov 06, 2009 at 10:41:51PM -0000, Thomas Gleixner wrote: > > 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 > > applied with one nit. > > > > > -DEFINE_SPINLOCK(smp_lock); > > - > > You forgot to mention this was unused. :) Confused me for a while. Gah. Wanted to add it to the changelog, but slipped from my mind. Sorry for the confusion, tglx -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Patch
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;
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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/