diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-11-06 22:41:51 +0000 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2009-12-16 03:48:55 +0000 |
| commit | 6ad6c4245e4ed0b88f5ee379c04c834b52b272a6 (patch) | |
| tree | 6f796006f764764c899f45461d7420558b157cc8 /arch/parisc | |
| parent | 8f78df872d463ac43315916663b3e688ebb2422f (diff) | |
| download | linux-stable-6ad6c4245e4ed0b88f5ee379c04c834b52b272a6.tar.gz linux-stable-6ad6c4245e4ed0b88f5ee379c04c834b52b272a6.tar.bz2 linux-stable-6ad6c4245e4ed0b88f5ee379c04c834b52b272a6.zip | |
parisc: Replace old style lock init in smp.c
SPIN_LOCK_UNLOCKED is deprecated. Init the per cpu locks at runtime
instead.
(Also kills the unused smp_lock --kyle)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/smp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index 1fd0f0cec037..3f2fce8ce6b6 100644 --- a/arch/parisc/kernel/smp.c +++ b/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 __cpuinitdata; 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; |