diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 10:12:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 10:12:50 -0700 |
| commit | 6cd59f7a4119fef124677827a9b30684c2c8e674 (patch) | |
| tree | 084162f271f09b0d4787b92ae414cf0cc310f521 /arch/arm/mach-integrator | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
| parent | 73eb7d9e8cfd16813eec94d0ec8fa2a5262a85cc (diff) | |
| download | kernel-crypto-6cd59f7a4119fef124677827a9b30684c2c8e674.tar.gz kernel-crypto-6cd59f7a4119fef124677827a9b30684c2c8e674.tar.xz kernel-crypto-6cd59f7a4119fef124677827a9b30684c2c8e674.zip | |
Merge /home/torvalds/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/platsmp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/platsmp.c b/arch/arm/mach-integrator/platsmp.c index ead15dfcb53..2ba02577709 100644 --- a/arch/arm/mach-integrator/platsmp.c +++ b/arch/arm/mach-integrator/platsmp.c @@ -174,11 +174,13 @@ void __init smp_prepare_cpus(unsigned int max_cpus) max_cpus = ncores; /* - * Initialise the present mask - this tells us which CPUs should - * be present. + * Initialise the possible/present maps. + * cpu_possible_map describes the set of CPUs which may be present + * cpu_present_map describes the set of CPUs populated */ for (i = 0; i < max_cpus; i++) { - cpu_set(i, cpu_present_mask); + cpu_set(i, cpu_possible_map); + cpu_set(i, cpu_present_map); } /* |