git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
mips
/
sibyte
/
sb1250
/
smp.c
diff --git
a/arch/mips/sibyte/sb1250/smp.c
b/arch/mips/sibyte/sb1250/smp.c
index
d510b31
..
c38e1f3
100644
(file)
--- a/
arch/mips/sibyte/sb1250/smp.c
+++ b/
arch/mips/sibyte/sb1250/smp.c
@@
-29,18
+29,18
@@
#include <asm/sibyte/sb1250_int.h>
static void *mailbox_set_regs[] = {
#include <asm/sibyte/sb1250_int.h>
static void *mailbox_set_regs[] = {
-
(void *)
IOADDR(A_IMR_CPU0_BASE + R_IMR_MAILBOX_SET_CPU),
-
(void *)
IOADDR(A_IMR_CPU1_BASE + R_IMR_MAILBOX_SET_CPU)
+ IOADDR(A_IMR_CPU0_BASE + R_IMR_MAILBOX_SET_CPU),
+ IOADDR(A_IMR_CPU1_BASE + R_IMR_MAILBOX_SET_CPU)
};
static void *mailbox_clear_regs[] = {
};
static void *mailbox_clear_regs[] = {
-
(void *)
IOADDR(A_IMR_CPU0_BASE + R_IMR_MAILBOX_CLR_CPU),
-
(void *)
IOADDR(A_IMR_CPU1_BASE + R_IMR_MAILBOX_CLR_CPU)
+ IOADDR(A_IMR_CPU0_BASE + R_IMR_MAILBOX_CLR_CPU),
+ IOADDR(A_IMR_CPU1_BASE + R_IMR_MAILBOX_CLR_CPU)
};
static void *mailbox_regs[] = {
};
static void *mailbox_regs[] = {
-
(void *)
IOADDR(A_IMR_CPU0_BASE + R_IMR_MAILBOX_CPU),
-
(void *)
IOADDR(A_IMR_CPU1_BASE + R_IMR_MAILBOX_CPU)
+ IOADDR(A_IMR_CPU0_BASE + R_IMR_MAILBOX_CPU),
+ IOADDR(A_IMR_CPU1_BASE + R_IMR_MAILBOX_CPU)
};
/*
};
/*
@@
-73,10
+73,10
@@
void sb1250_smp_finish(void)
*/
void core_send_ipi(int cpu, unsigned int action)
{
*/
void core_send_ipi(int cpu, unsigned int action)
{
- __raw_writeq((((u64)action)<< 48), mailbox_set_regs[cpu]);
+ __raw_writeq((((u64)action)
<< 48), mailbox_set_regs[cpu]);
}
}
-void sb1250_mailbox_interrupt(
struct pt_regs *regs
)
+void sb1250_mailbox_interrupt(
void
)
{
int cpu = smp_processor_id();
unsigned int action;
{
int cpu = smp_processor_id();
unsigned int action;
@@
-86,7
+86,7
@@
void sb1250_mailbox_interrupt(struct pt_regs *regs)
action = (____raw_readq(mailbox_regs[cpu]) >> 48) & 0xffff;
/* Clear the mailbox to clear the interrupt */
action = (____raw_readq(mailbox_regs[cpu]) >> 48) & 0xffff;
/* Clear the mailbox to clear the interrupt */
- ____raw_writeq(((u64)action)
<<
48, mailbox_clear_regs[cpu]);
+ ____raw_writeq(((u64)action)
<<
48, mailbox_clear_regs[cpu]);
/*
* Nothing to do for SMP_RESCHEDULE_YOURSELF; returning from the
/*
* Nothing to do for SMP_RESCHEDULE_YOURSELF; returning from the