diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 06:24:38 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 06:24:38 -0500 |
| commit | c3895b01e80d120e8d19435f7cb1fa4c60c4e269 (patch) | |
| tree | 426f36e999289eeb7a41f6f4ca8ff45bfc2372aa /arch/cris/arch-v32/kernel/smp.c | |
| parent | 3c68b4a8071fb11d905570d9b0e23034adc6c2bb (diff) | |
| parent | 968ea6d80e395cf11a51143cfa1b9a14ada676df (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-ingo into cpus4096
Diffstat (limited to 'arch/cris/arch-v32/kernel/smp.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/smp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c index 52e16c6436f9..9dac17334640 100644 --- a/arch/cris/arch-v32/kernel/smp.c +++ b/arch/cris/arch-v32/kernel/smp.c | |||
| @@ -29,11 +29,7 @@ | |||
| 29 | spinlock_t cris_atomic_locks[] = { [0 ... LOCK_COUNT - 1] = SPIN_LOCK_UNLOCKED}; | 29 | spinlock_t cris_atomic_locks[] = { [0 ... LOCK_COUNT - 1] = SPIN_LOCK_UNLOCKED}; |
| 30 | 30 | ||
| 31 | /* CPU masks */ | 31 | /* CPU masks */ |
| 32 | cpumask_t cpu_online_map = CPU_MASK_NONE; | ||
| 33 | EXPORT_SYMBOL(cpu_online_map); | ||
| 34 | cpumask_t phys_cpu_present_map = CPU_MASK_NONE; | 32 | cpumask_t phys_cpu_present_map = CPU_MASK_NONE; |
| 35 | cpumask_t cpu_possible_map; | ||
| 36 | EXPORT_SYMBOL(cpu_possible_map); | ||
| 37 | EXPORT_SYMBOL(phys_cpu_present_map); | 33 | EXPORT_SYMBOL(phys_cpu_present_map); |
| 38 | 34 | ||
| 39 | /* Variables used during SMP boot */ | 35 | /* Variables used during SMP boot */ |