projects
/
linux-flexiantxendom0-3.2.10.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to 3.4-final.
[linux-flexiantxendom0-3.2.10.git]
/
arch
/
mn10300
/
kernel
/
smp.c
diff --git
a/arch/mn10300/kernel/smp.c
b/arch/mn10300/kernel/smp.c
index
910dddf
..
9cd69ad
100644
(file)
--- a/
arch/mn10300/kernel/smp.c
+++ b/
arch/mn10300/kernel/smp.c
@@
-24,6
+24,7
@@
#include <linux/sched.h>
#include <linux/profile.h>
#include <linux/smp.h>
#include <linux/sched.h>
#include <linux/profile.h>
#include <linux/smp.h>
+#include <linux/cpu.h>
#include <asm/tlbflush.h>
#include <asm/bitops.h>
#include <asm/processor.h>
#include <asm/tlbflush.h>
#include <asm/bitops.h>
#include <asm/processor.h>
@@
-38,7
+39,6
@@
#include "internal.h"
#ifdef CONFIG_HOTPLUG_CPU
#include "internal.h"
#ifdef CONFIG_HOTPLUG_CPU
-#include <linux/cpu.h>
#include <asm/cacheflush.h>
static unsigned long sleep_mode[NR_CPUS];
#include <asm/cacheflush.h>
static unsigned long sleep_mode[NR_CPUS];
@@
-874,10
+874,13
@@
static void __init smp_online(void)
cpu = smp_processor_id();
cpu = smp_processor_id();
- local_irq_enable();
+ notify_cpu_starting(cpu);
+ ipi_call_lock();
set_cpu_online(cpu, true);
set_cpu_online(cpu, true);
- smp_wmb();
+ ipi_call_unlock();
+
+ local_irq_enable();
}
/**
}
/**