aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel/smp.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2009-03-15 23:49:38 -0400
committerRusty Russell <rusty@rustcorp.com.au>2009-03-15 23:49:38 -0400
commit9bc181d8d7cb6462de0c315e364780ad275f7c57 (patch)
tree01fca0c4ae6e024754ef71ca4f5c4eecf22f2cc5 /arch/parisc/kernel/smp.c
parentbd071e1a371d31db243edc4714ff9e8d1ea1309e (diff)
cpumask: Use accessors code.: parisc
Impact: use new API Use the accessors rather than frobbing bits directly. Most of this is in arch code I haven't even compiled, but it is mostly straightforward. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Mike Travis <travis@sgi.com>
Diffstat (limited to 'arch/parisc/kernel/smp.c')
-rw-r--r--arch/parisc/kernel/smp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index ba9b6808e2d9..869197992f97 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -113,7 +113,7 @@ halt_processor(void)
113{ 113{
114 /* REVISIT : redirect I/O Interrupts to another CPU? */ 114 /* REVISIT : redirect I/O Interrupts to another CPU? */
115 /* REVISIT : does PM *know* this CPU isn't available? */ 115 /* REVISIT : does PM *know* this CPU isn't available? */
116 cpu_clear(smp_processor_id(), cpu_online_map); 116 set_cpu_online(smp_processor_id(), false);
117 local_irq_disable(); 117 local_irq_disable();
118 for (;;) 118 for (;;)
119 ; 119 ;
@@ -296,13 +296,14 @@ smp_cpu_init(int cpunum)
296 mb(); 296 mb();
297 297
298 /* Well, support 2.4 linux scheme as well. */ 298 /* Well, support 2.4 linux scheme as well. */
299 if (cpu_test_and_set(cpunum, cpu_online_map)) 299 if (cpu_isset(cpunum, cpu_online_map))
300 { 300 {
301 extern void machine_halt(void); /* arch/parisc.../process.c */ 301 extern void machine_halt(void); /* arch/parisc.../process.c */
302 302
303 printk(KERN_CRIT "CPU#%d already initialized!\n", cpunum); 303 printk(KERN_CRIT "CPU#%d already initialized!\n", cpunum);
304 machine_halt(); 304 machine_halt();
305 } 305 }
306 set_cpu_online(cpunum, true);
306 307
307 /* Initialise the idle task for this CPU */ 308 /* Initialise the idle task for this CPU */
308 atomic_inc(&init_mm.mm_count); 309 atomic_inc(&init_mm.mm_count);
@@ -424,8 +425,8 @@ void __init smp_prepare_boot_cpu(void)
424 /* Setup BSP mappings */ 425 /* Setup BSP mappings */
425 printk(KERN_INFO "SMP: bootstrap CPU ID is %d\n", bootstrap_processor); 426 printk(KERN_INFO "SMP: bootstrap CPU ID is %d\n", bootstrap_processor);
426 427
427 cpu_set(bootstrap_processor, cpu_online_map); 428 set_cpu_online(bootstrap_processor, true);
428 cpu_set(bootstrap_processor, cpu_present_map); 429 set_cpu_present(bootstrap_processor, true);
429} 430}
430 431
431 432
@@ -436,8 +437,7 @@ void __init smp_prepare_boot_cpu(void)
436*/ 437*/
437void __init smp_prepare_cpus(unsigned int max_cpus) 438void __init smp_prepare_cpus(unsigned int max_cpus)
438{ 439{
439 cpus_clear(cpu_present_map); 440 init_cpu_present(cpumask_of(0));
440 cpu_set(0, cpu_present_map);
441 441
442 parisc_max_cpus = max_cpus; 442 parisc_max_cpus = max_cpus;
443 if (!max_cpus) 443 if (!max_cpus)