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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
be91b39
..
f859db0
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,7
+73,7
@@
void sb1250_smp_finish(void)
*/
void core_send_ipi(int cpu, unsigned int action)
{
*/
void core_send_ipi(int cpu, unsigned int action)
{
-
bus
_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(struct pt_regs *regs)
@@
-83,10
+83,10
@@
void sb1250_mailbox_interrupt(struct pt_regs *regs)
kstat_this_cpu.irqs[K_INT_MBOX_0]++;
/* Load the mailbox register to figure out what we're supposed to do */
kstat_this_cpu.irqs[K_INT_MBOX_0]++;
/* Load the mailbox register to figure out what we're supposed to do */
- action = (__
bus
_readq(mailbox_regs[cpu]) >> 48) & 0xffff;
+ action = (__
__raw
_readq(mailbox_regs[cpu]) >> 48) & 0xffff;
/* Clear the mailbox to clear the interrupt */
/* Clear the mailbox to clear the interrupt */
- __
bus
_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