git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/sam/kernel/linux-2.6/
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
smp.c
diff --git
a/arch/powerpc/kernel/smp.c
b/arch/powerpc/kernel/smp.c
index
13595a6
..
46c56cf
100644
(file)
--- a/
arch/powerpc/kernel/smp.c
+++ b/
arch/powerpc/kernel/smp.c
@@
-17,7
+17,6
@@
#undef DEBUG
#undef DEBUG
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sched.h>
@@
-362,7
+361,7
@@
void __init smp_prepare_cpus(unsigned int max_cpus)
smp_space_timers(max_cpus);
smp_space_timers(max_cpus);
- for_each_cpu(cpu)
+ for_each_
possible_
cpu(cpu)
if (cpu != boot_cpuid)
smp_create_idle(cpu);
}
if (cpu != boot_cpuid)
smp_create_idle(cpu);
}
@@
-492,7
+491,7
@@
int __devinit __cpu_up(unsigned int cpu)
* -- Cort
*/
if (system_state < SYSTEM_RUNNING)
* -- Cort
*/
if (system_state < SYSTEM_RUNNING)
- for (c = 5000; c && !cpu_callin_map[cpu]; c--)
+ for (c = 5000
0
; c && !cpu_callin_map[cpu]; c--)
udelay(100);
#ifdef CONFIG_HOTPLUG_CPU
else
udelay(100);
#ifdef CONFIG_HOTPLUG_CPU
else
@@
-541,7
+540,7
@@
int __devinit start_secondary(void *unused)
smp_ops->take_timebase();
if (system_state > SYSTEM_BOOTING)
smp_ops->take_timebase();
if (system_state > SYSTEM_BOOTING)
-
per_cpu(last_jiffy, cpu) = get_tb
();
+
snapshot_timebase
();
spin_lock(&call_lock);
cpu_set(cpu, cpu_online_map);
spin_lock(&call_lock);
cpu_set(cpu, cpu_online_map);
@@
-573,6
+572,8
@@
void __init smp_cpus_done(unsigned int max_cpus)
set_cpus_allowed(current, old_mask);
set_cpus_allowed(current, old_mask);
+ snapshot_timebases();
+
dump_numa_cpu_topology();
}
dump_numa_cpu_topology();
}