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 'topic/oss' into for-linus
[pandora-kernel.git]
/
arch
/
mips
/
cavium-octeon
/
smp.c
diff --git
a/arch/mips/cavium-octeon/smp.c
b/arch/mips/cavium-octeon/smp.c
index
0b891a9
..
32d51a3
100644
(file)
--- a/
arch/mips/cavium-octeon/smp.c
+++ b/
arch/mips/cavium-octeon/smp.c
@@
-194,11
+194,11
@@
static void octeon_init_secondary(void)
void octeon_prepare_cpus(unsigned int max_cpus)
{
cvmx_write_csr(CVMX_CIU_MBOX_CLRX(cvmx_get_core_num()), 0xffffffff);
void octeon_prepare_cpus(unsigned int max_cpus)
{
cvmx_write_csr(CVMX_CIU_MBOX_CLRX(cvmx_get_core_num()), 0xffffffff);
- if (request_irq(OCTEON_IRQ_MBOX0, mailbox_interrupt, IRQF_
SHAR
ED,
+ if (request_irq(OCTEON_IRQ_MBOX0, mailbox_interrupt, IRQF_
DISABL
ED,
"mailbox0", mailbox_interrupt)) {
panic("Cannot request_irq(OCTEON_IRQ_MBOX0)\n");
}
"mailbox0", mailbox_interrupt)) {
panic("Cannot request_irq(OCTEON_IRQ_MBOX0)\n");
}
- if (request_irq(OCTEON_IRQ_MBOX1, mailbox_interrupt, IRQF_
SHAR
ED,
+ if (request_irq(OCTEON_IRQ_MBOX1, mailbox_interrupt, IRQF_
DISABL
ED,
"mailbox1", mailbox_interrupt)) {
panic("Cannot request_irq(OCTEON_IRQ_MBOX1)\n");
}
"mailbox1", mailbox_interrupt)) {
panic("Cannot request_irq(OCTEON_IRQ_MBOX1)\n");
}