diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-07 11:01:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-07 11:01:12 +1100 |
| commit | b394f11a76ae0338f4b62dec9d94dc81d560a2bb (patch) | |
| tree | 864a3145fcaf6dcbb2d3dbf34cf6c5d121d7994f /arch | |
| parent | ccd3c4d791b2dcb9511bf764a7a9a9e9836952c5 (diff) | |
| parent | 60cc10ed86d8aedf464e1a7b95c65b0c3425a9ed (diff) | |
Merge remote-tracking branch 'cris/for-next'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/cris/arch-v32/kernel/smp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c index 84fed3b4b079..4c9e3e1ba5d1 100644 --- a/arch/cris/arch-v32/kernel/smp.c +++ b/arch/cris/arch-v32/kernel/smp.c @@ -26,7 +26,9 @@ #define FLUSH_ALL (void*)0xffffffff /* Vector of locks used for various atomic operations */ -spinlock_t cris_atomic_locks[] = { [0 ... LOCK_COUNT - 1] = SPIN_LOCK_UNLOCKED}; +spinlock_t cris_atomic_locks[] = { + [0 ... LOCK_COUNT - 1] = __SPIN_LOCK_UNLOCKED(cris_atomic_locks) +}; /* CPU masks */ cpumask_t phys_cpu_present_map = CPU_MASK_NONE; |