diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:13:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:13:43 -0500 |
| commit | 88e3c1da8b3258a81c5c81d4e7e22557b7d71ba7 (patch) | |
| tree | ab518773c0ff4606f1a57d00b5931332a7e1d96e /arch/sh/kernel | |
| parent | fa4fa40a990f8f4eff65476bef32007c154bbac0 (diff) | |
| parent | b0e6e962992b76580f4900b166a337bad7c1e81b (diff) | |
| download | lwn-88e3c1da8b3258a81c5c81d4e7e22557b7d71ba7.tar.gz lwn-88e3c1da8b3258a81c5c81d4e7e22557b7d71ba7.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/irq.c | 5 | ||||
| -rw-r--r-- | arch/sh/kernel/setup.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index 6883c00728cb..b56e79632f24 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c @@ -35,9 +35,8 @@ int show_interrupts(struct seq_file *p, void *v) if (i == 0) { seq_puts(p, " "); - for (j=0; j<NR_CPUS; j++) - if (cpu_online(j)) - seq_printf(p, "CPU%d ",j); + for_each_online_cpu(j) + seq_printf(p, "CPU%d ",j); seq_putc(p, '\n'); } diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index a067a34e0b64..c0e79843f580 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -404,9 +404,8 @@ static int __init topology_init(void) { int cpu_id; - for (cpu_id = 0; cpu_id < NR_CPUS; cpu_id++) - if (cpu_possible(cpu_id)) - register_cpu(&cpu[cpu_id], cpu_id, NULL); + for_each_cpu(cpu_id) + register_cpu(&cpu[cpu_id], cpu_id, NULL); return 0; } |