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 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
smp.c
diff --git
a/arch/powerpc/platforms/pseries/smp.c
b/arch/powerpc/platforms/pseries/smp.c
index
fbffd7e
..
4e44c4d
100644
(file)
--- a/
arch/powerpc/platforms/pseries/smp.c
+++ b/
arch/powerpc/platforms/pseries/smp.c
@@
-27,7
+27,7
@@
#include <linux/cpu.h>
#include <asm/ptrace.h>
#include <linux/cpu.h>
#include <asm/ptrace.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/irq.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/irq.h>
#include <asm/page.h>
#include <asm/pgtable.h>
@@
-44,7
+44,6
@@
#include <asm/mpic.h>
#include <asm/vdso_datapage.h>
#include <asm/cputhreads.h>
#include <asm/mpic.h>
#include <asm/vdso_datapage.h>
#include <asm/cputhreads.h>
-#include <asm/mpic.h>
#include <asm/xics.h>
#include "plpar_wrappers.h"
#include <asm/xics.h>
#include "plpar_wrappers.h"
@@
-207,7
+206,7
@@
static struct smp_ops_t pSeries_mpic_smp_ops = {
};
static struct smp_ops_t pSeries_xics_smp_ops = {
};
static struct smp_ops_t pSeries_xics_smp_ops = {
- .message_pass =
smp_muxed_ipi_message_pass,
+ .message_pass =
NULL, /* Use smp_muxed_ipi_message_pass */
.cause_ipi = NULL, /* Filled at runtime by xics_smp_probe() */
.probe = xics_smp_probe,
.kick_cpu = smp_pSeries_kick_cpu,
.cause_ipi = NULL, /* Filled at runtime by xics_smp_probe() */
.probe = xics_smp_probe,
.kick_cpu = smp_pSeries_kick_cpu,