summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2011-04-18 11:25:42 +0000
committerDavid S. Miller <davem@davemloft.net>2011-04-19 22:11:39 -0700
commitdb1cdd146a0814b6f312fe1a7fa1ab87ac177b2a (patch)
tree3a328c40640ce1f7aa7d44709fc46d7ba5b0d72b /arch/sparc/kernel
parent2f666bcf757cb72549f360ef6da02f03620a48b6 (diff)
downloadlinux-stable-db1cdd146a0814b6f312fe1a7fa1ab87ac177b2a.tar.gz
linux-stable-db1cdd146a0814b6f312fe1a7fa1ab87ac177b2a.tar.bz2
linux-stable-db1cdd146a0814b6f312fe1a7fa1ab87ac177b2a.zip
sparc32,sun4d: rename sbus_tid to board_to_cpu in irq support
The new name reflects the actual usage much better. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r--arch/sparc/kernel/sun4d_irq.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index 77b4a8992710..ee35c45ffb89 100644
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -51,7 +51,11 @@ static struct sun4d_timer_regs __iomem *sun4d_timers;
#define TIMER_IRQ 10
#define MAX_STATIC_ALLOC 4
-static unsigned char sbus_tid[32];
+
+/* Specify which cpu handle interrupts from which board.
+ * Index is board - value is cpu.
+ */
+static unsigned char board_to_cpu[32];
static struct irqaction *irq_action[NR_IRQS];
@@ -363,7 +367,7 @@ out:
static void sun4d_disable_irq(unsigned int irq)
{
- int tid = sbus_tid[(irq >> 5) - 1];
+ int tid = board_to_cpu[(irq >> 5) - 1];
unsigned long flags;
if (irq < NR_IRQS)
@@ -376,7 +380,7 @@ static void sun4d_disable_irq(unsigned int irq)
static void sun4d_enable_irq(unsigned int irq)
{
- int tid = sbus_tid[(irq >> 5) - 1];
+ int tid = board_to_cpu[(irq >> 5) - 1];
unsigned long flags;
if (irq < NR_IRQS)
@@ -413,7 +417,7 @@ void __init sun4d_distribute_irqs(void)
for_each_node_by_name(dp, "sbi") {
int devid = of_getintprop_default(dp, "device-id", 0);
int board = of_getintprop_default(dp, "board#", 0);
- sbus_tid[board] = cpuid;
+ board_to_cpu[board] = cpuid;
set_sbi_tid(devid, cpuid << 3);
}
printk(KERN_ERR "All sbus IRQs directed to CPU%d\n", cpuid);
@@ -587,7 +591,7 @@ void __init sun4d_init_sbi_irq(void)
unsigned int mask;
set_sbi_tid(devid, target_cpu << 3);
- sbus_tid[board] = target_cpu;
+ board_to_cpu[board] = target_cpu;
/* Get rid of pending irqs from PROM */
mask = acquire_sbi(devid, 0xffffffff);