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 'akpm-incoming-2'
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
smp.h
diff --git
a/arch/x86/include/asm/smp.h
b/arch/x86/include/asm/smp.h
index
4cfc908
..
4c2f63c
100644
(file)
--- a/
arch/x86/include/asm/smp.h
+++ b/
arch/x86/include/asm/smp.h
@@
-50,7
+50,7
@@
struct smp_ops {
void (*smp_prepare_cpus)(unsigned max_cpus);
void (*smp_cpus_done)(unsigned max_cpus);
void (*smp_prepare_cpus)(unsigned max_cpus);
void (*smp_cpus_done)(unsigned max_cpus);
- void (*s
mp_send_stop)(void
);
+ void (*s
top_other_cpus)(int wait
);
void (*smp_send_reschedule)(int cpu);
int (*cpu_up)(unsigned cpu);
void (*smp_send_reschedule)(int cpu);
int (*cpu_up)(unsigned cpu);
@@
-73,7
+73,12
@@
extern struct smp_ops smp_ops;
static inline void smp_send_stop(void)
{
static inline void smp_send_stop(void)
{
- smp_ops.smp_send_stop();
+ smp_ops.stop_other_cpus(0);
+}
+
+static inline void stop_other_cpus(void)
+{
+ smp_ops.stop_other_cpus(1);
}
static inline void smp_prepare_boot_cpu(void)
}
static inline void smp_prepare_boot_cpu(void)