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 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
mm
/
mmu_context_nohash.c
diff --git
a/arch/powerpc/mm/mmu_context_nohash.c
b/arch/powerpc/mm/mmu_context_nohash.c
index
ddfd7ad
..
5ce9984
100644
(file)
--- a/
arch/powerpc/mm/mmu_context_nohash.c
+++ b/
arch/powerpc/mm/mmu_context_nohash.c
@@
-334,7
+334,7
@@
static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self,
/* We don't touch CPU 0 map, it's allocated at aboot and kept
* around forever
*/
/* We don't touch CPU 0 map, it's allocated at aboot and kept
* around forever
*/
- if (cpu ==
0
)
+ if (cpu ==
boot_cpuid
)
return NOTIFY_OK;
switch (action) {
return NOTIFY_OK;
switch (action) {
@@
-420,9
+420,11
@@
void __init mmu_context_init(void)
*/
context_map = alloc_bootmem(CTX_MAP_SIZE);
context_mm = alloc_bootmem(sizeof(void *) * (last_context + 1));
*/
context_map = alloc_bootmem(CTX_MAP_SIZE);
context_mm = alloc_bootmem(sizeof(void *) * (last_context + 1));
+#ifndef CONFIG_SMP
stale_map[0] = alloc_bootmem(CTX_MAP_SIZE);
stale_map[0] = alloc_bootmem(CTX_MAP_SIZE);
+#else
+ stale_map[boot_cpuid] = alloc_bootmem(CTX_MAP_SIZE);
-#ifdef CONFIG_SMP
register_cpu_notifier(&mmu_context_cpu_nb);
#endif
register_cpu_notifier(&mmu_context_cpu_nb);
#endif