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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
smpboot.c
diff --git
a/arch/x86_64/kernel/smpboot.c
b/arch/x86_64/kernel/smpboot.c
index
29f2578
..
0693740
100644
(file)
--- a/
arch/x86_64/kernel/smpboot.c
+++ b/
arch/x86_64/kernel/smpboot.c
@@
-659,7
+659,7
@@
static void __init do_boot_cpu (int apicid)
Dprintk("CPU has booted.\n");
} else {
boot_error = 1;
Dprintk("CPU has booted.\n");
} else {
boot_error = 1;
- if (*((volatile unsigned char *)phys_to_virt(
SMP_TRAMPOLINE_BASE
))
+ if (*((volatile unsigned char *)phys_to_virt(
8192
))
== 0xA5)
/* trampoline started but...? */
printk("Stuck ??\n");
== 0xA5)
/* trampoline started but...? */
printk("Stuck ??\n");
@@
-676,6
+676,9
@@
static void __init do_boot_cpu (int apicid)
clear_bit(cpu, &cpu_initialized); /* was set by cpu_init() */
cpucount--;
}
clear_bit(cpu, &cpu_initialized); /* was set by cpu_init() */
cpucount--;
}
+
+ /* mark "stuck" area as not stuck */
+ *((volatile unsigned *)phys_to_virt(8192)) = 0;
}
cycles_t cacheflush_time;
}
cycles_t cacheflush_time;