git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
s390
/
kernel
/
smp.c
diff --git
a/arch/s390/kernel/smp.c
b/arch/s390/kernel/smp.c
index
343120c
..
7dbe00c
100644
(file)
--- a/
arch/s390/kernel/smp.c
+++ b/
arch/s390/kernel/smp.c
@@
-665,9
+665,7
@@
__cpu_up(unsigned int cpu)
cpu_lowcore->current_task = (unsigned long) idle;
cpu_lowcore->cpu_data.cpu_nr = cpu;
eieio();
cpu_lowcore->current_task = (unsigned long) idle;
cpu_lowcore->cpu_data.cpu_nr = cpu;
eieio();
-
- while (signal_processor(cpu,sigp_restart) == sigp_busy)
- udelay(10);
+ signal_processor(cpu,sigp_restart);
while (!cpu_online(cpu))
cpu_relax();
while (!cpu_online(cpu))
cpu_relax();
@@
-801,7
+799,9
@@
void __init smp_prepare_cpus(unsigned int max_cpus)
*/
print_cpu_info(&S390_lowcore.cpu_data);
*/
print_cpu_info(&S390_lowcore.cpu_data);
- for_each_possible_cpu(i) {
+ for(i = 0; i < NR_CPUS; i++) {
+ if (!cpu_possible(i))
+ continue;
lowcore_ptr[i] = (struct _lowcore *)
__get_free_pages(GFP_KERNEL|GFP_DMA,
sizeof(void*) == 8 ? 1 : 0);
lowcore_ptr[i] = (struct _lowcore *)
__get_free_pages(GFP_KERNEL|GFP_DMA,
sizeof(void*) == 8 ? 1 : 0);
@@
-831,7
+831,7
@@
void __init smp_prepare_cpus(unsigned int max_cpus)
#endif
set_prefix((u32)(unsigned long) lowcore_ptr[smp_processor_id()]);
#endif
set_prefix((u32)(unsigned long) lowcore_ptr[smp_processor_id()]);
- for_each_
possible_
cpu(cpu)
+ for_each_cpu(cpu)
if (cpu != smp_processor_id())
smp_create_idle(cpu);
}
if (cpu != smp_processor_id())
smp_create_idle(cpu);
}
@@
-868,7
+868,7
@@
static int __init topology_init(void)
int cpu;
int ret;
int cpu;
int ret;
- for_each_
possible_
cpu(cpu) {
+ for_each_cpu(cpu) {
ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu, NULL);
if (ret)
printk(KERN_WARNING "topology_init: register_cpu %d "
ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu, NULL);
if (ret)
printk(KERN_WARNING "topology_init: register_cpu %d "