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 master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
smpboot.c
diff --git
a/arch/x86_64/kernel/smpboot.c
b/arch/x86_64/kernel/smpboot.c
index
540c0cc
..
3ae9ffd
100644
(file)
--- a/
arch/x86_64/kernel/smpboot.c
+++ b/
arch/x86_64/kernel/smpboot.c
@@
-38,7
+38,6
@@
*/
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/init.h>
#include <linux/mm.h>
@@
-47,9
+46,10
@@
#include <linux/bootmem.h>
#include <linux/thread_info.h>
#include <linux/module.h>
#include <linux/bootmem.h>
#include <linux/thread_info.h>
#include <linux/module.h>
-
#include <linux/delay.h>
#include <linux/mc146818rtc.h>
#include <linux/delay.h>
#include <linux/mc146818rtc.h>
+#include <linux/smp.h>
+
#include <asm/mtrr.h>
#include <asm/pgalloc.h>
#include <asm/desc.h>
#include <asm/mtrr.h>
#include <asm/pgalloc.h>
#include <asm/desc.h>
@@
-772,7
+772,7
@@
static int __cpuinit do_boot_cpu(int cpu, int apicid)
unsigned long start_rip;
struct create_idle c_idle = {
.cpu = cpu,
unsigned long start_rip;
struct create_idle c_idle = {
.cpu = cpu,
- .done = COMPLETION_INITIALIZER(c_idle.done),
+ .done = COMPLETION_INITIALIZER
_ONSTACK
(c_idle.done),
};
DECLARE_WORK(work, do_fork_idle, &c_idle);
};
DECLARE_WORK(work, do_fork_idle, &c_idle);