Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 68637
b: refs/heads/master
c: 45b3f4c
h: refs/heads/master
i:
  68635: 975c718
v: v3
  • Loading branch information
David S. Miller committed Oct 14, 2007
1 parent 33ff3b9 commit 173930a
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 256c1df36bbec6530c6f9b5a840cc5e87315c19e
refs/heads/master: 45b3f4cc6025bdb14beb65b8a3a732bf55d1bc41
40 changes: 20 additions & 20 deletions trunk/arch/sparc64/kernel/irq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ static struct {
unsigned int dev_handle;
unsigned int dev_ino;
unsigned int in_use;
} virt_to_real_irq_table[NR_IRQS];
} virt_irq_table[NR_IRQS];
static DEFINE_SPINLOCK(virt_irq_alloc_lock);

unsigned char virt_irq_alloc(unsigned int dev_handle,
Expand All @@ -142,16 +142,16 @@ unsigned char virt_irq_alloc(unsigned int dev_handle,
spin_lock_irqsave(&virt_irq_alloc_lock, flags);

for (ent = 1; ent < NR_IRQS; ent++) {
if (!virt_to_real_irq_table[ent].in_use)
if (!virt_irq_table[ent].in_use)
break;
}
if (ent >= NR_IRQS) {
printk(KERN_ERR "IRQ: Out of virtual IRQs.\n");
ent = 0;
} else {
virt_to_real_irq_table[ent].dev_handle = dev_handle;
virt_to_real_irq_table[ent].dev_ino = dev_ino;
virt_to_real_irq_table[ent].in_use = 1;
virt_irq_table[ent].dev_handle = dev_handle;
virt_irq_table[ent].dev_ino = dev_ino;
virt_irq_table[ent].in_use = 1;
}

spin_unlock_irqrestore(&virt_irq_alloc_lock, flags);
Expand All @@ -169,7 +169,7 @@ void virt_irq_free(unsigned int virt_irq)

spin_lock_irqsave(&virt_irq_alloc_lock, flags);

virt_to_real_irq_table[virt_irq].in_use = 0;
virt_irq_table[virt_irq].in_use = 0;

spin_unlock_irqrestore(&virt_irq_alloc_lock, flags);
}
Expand Down Expand Up @@ -360,7 +360,7 @@ static void sun4u_irq_end(unsigned int virt_irq)

static void sun4v_irq_enable(unsigned int virt_irq)
{
unsigned int ino = virt_to_real_irq_table[virt_irq].dev_ino;
unsigned int ino = virt_irq_table[virt_irq].dev_ino;
unsigned long cpuid = irq_choose_cpu(virt_irq);
int err;

Expand All @@ -380,7 +380,7 @@ static void sun4v_irq_enable(unsigned int virt_irq)

static void sun4v_set_affinity(unsigned int virt_irq, cpumask_t mask)
{
unsigned int ino = virt_to_real_irq_table[virt_irq].dev_ino;
unsigned int ino = virt_irq_table[virt_irq].dev_ino;
unsigned long cpuid = irq_choose_cpu(virt_irq);
int err;

Expand All @@ -392,7 +392,7 @@ static void sun4v_set_affinity(unsigned int virt_irq, cpumask_t mask)

static void sun4v_irq_disable(unsigned int virt_irq)
{
unsigned int ino = virt_to_real_irq_table[virt_irq].dev_ino;
unsigned int ino = virt_irq_table[virt_irq].dev_ino;
int err;

err = sun4v_intr_setenabled(ino, HV_INTR_DISABLED);
Expand All @@ -403,7 +403,7 @@ static void sun4v_irq_disable(unsigned int virt_irq)

static void sun4v_irq_end(unsigned int virt_irq)
{
unsigned int ino = virt_to_real_irq_table[virt_irq].dev_ino;
unsigned int ino = virt_irq_table[virt_irq].dev_ino;
struct irq_desc *desc = irq_desc + virt_irq;
int err;

Expand All @@ -423,8 +423,8 @@ static void sun4v_virq_enable(unsigned int virt_irq)

cpuid = irq_choose_cpu(virt_irq);

dev_handle = virt_to_real_irq_table[virt_irq].dev_handle;
dev_ino = virt_to_real_irq_table[virt_irq].dev_ino;
dev_handle = virt_irq_table[virt_irq].dev_handle;
dev_ino = virt_irq_table[virt_irq].dev_ino;

err = sun4v_vintr_set_target(dev_handle, dev_ino, cpuid);
if (err != HV_EOK)
Expand Down Expand Up @@ -452,8 +452,8 @@ static void sun4v_virt_set_affinity(unsigned int virt_irq, cpumask_t mask)

cpuid = irq_choose_cpu(virt_irq);

dev_handle = virt_to_real_irq_table[virt_irq].dev_handle;
dev_ino = virt_to_real_irq_table[virt_irq].dev_ino;
dev_handle = virt_irq_table[virt_irq].dev_handle;
dev_ino = virt_irq_table[virt_irq].dev_ino;

err = sun4v_vintr_set_target(dev_handle, dev_ino, cpuid);
if (err != HV_EOK)
Expand All @@ -467,8 +467,8 @@ static void sun4v_virq_disable(unsigned int virt_irq)
unsigned long dev_handle, dev_ino;
int err;

dev_handle = virt_to_real_irq_table[virt_irq].dev_handle;
dev_ino = virt_to_real_irq_table[virt_irq].dev_ino;
dev_handle = virt_irq_table[virt_irq].dev_handle;
dev_ino = virt_irq_table[virt_irq].dev_ino;

err = sun4v_vintr_set_valid(dev_handle, dev_ino,
HV_INTR_DISABLED);
Expand All @@ -487,8 +487,8 @@ static void sun4v_virq_end(unsigned int virt_irq)
if (unlikely(desc->status & (IRQ_DISABLED|IRQ_INPROGRESS)))
return;

dev_handle = virt_to_real_irq_table[virt_irq].dev_handle;
dev_ino = virt_to_real_irq_table[virt_irq].dev_ino;
dev_handle = virt_irq_table[virt_irq].dev_handle;
dev_ino = virt_irq_table[virt_irq].dev_ino;

err = sun4v_vintr_set_state(dev_handle, dev_ino,
HV_INTR_STATE_IDLE);
Expand All @@ -503,7 +503,7 @@ static void run_pre_handler(unsigned int virt_irq)
struct irq_handler_data *data = get_irq_chip_data(virt_irq);
unsigned int ino;

ino = virt_to_real_irq_table[virt_irq].dev_ino;
ino = virt_irq_table[virt_irq].dev_ino;
if (likely(data->pre_handler)) {
data->pre_handler(ino,
data->pre_handler_arg1,
Expand Down Expand Up @@ -693,7 +693,7 @@ unsigned int sun4v_build_virq(u32 devhandle, unsigned int devino)

void ack_bad_irq(unsigned int virt_irq)
{
unsigned int ino = virt_to_real_irq_table[virt_irq].dev_ino;
unsigned int ino = virt_irq_table[virt_irq].dev_ino;

if (!ino)
ino = 0xdeadbeef;
Expand Down

0 comments on commit 173930a

Please sign in to comment.