Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 34079
b: refs/heads/master
c: 9e6ee34
h: refs/heads/master
i:
  34077: 03b97c1
  34075: cd17dda
  34071: 2cf03e1
  34063: 914e3f4
  34047: 2c5286a
v: v3
  • Loading branch information
Geoff Levand authored and Paul Mackerras committed Aug 25, 2006
1 parent 04d8a22 commit e332790
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 11a27ad782fc7ae4b7d6ac8fefad4ceb415300d6
refs/heads/master: 9e6ee340194e8bd8f463b55c6d028272c0e64155
22 changes: 11 additions & 11 deletions trunk/arch/powerpc/platforms/cell/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,17 @@ static struct irq_chip iic_chip = {
/* Get an IRQ number from the pending state register of the IIC */
static unsigned int iic_get_irq(struct pt_regs *regs)
{
struct cbe_iic_pending_bits pending;
struct iic *iic;

iic = &__get_cpu_var(iic);
*(unsigned long *) &pending =
in_be64((unsigned long __iomem *) &iic->regs->pending_destr);
iic->eoi_stack[++iic->eoi_ptr] = pending.prio;
BUG_ON(iic->eoi_ptr > 15);
struct cbe_iic_pending_bits pending;
struct iic *iic;

iic = &__get_cpu_var(iic);
*(unsigned long *) &pending =
in_be64((unsigned long __iomem *) &iic->regs->pending_destr);
iic->eoi_stack[++iic->eoi_ptr] = pending.prio;
BUG_ON(iic->eoi_ptr > 15);
if (pending.flags & CBE_IIC_IRQ_VALID)
return irq_linear_revmap(iic->host,
iic_pending_to_hwnum(pending));
iic_pending_to_hwnum(pending));
return NO_IRQ;
}

Expand Down Expand Up @@ -250,15 +250,15 @@ static int __init setup_iic(void)
struct resource r0, r1;
struct irq_host *host;
int found = 0;
const u32 *np;
const u32 *np;

for (dn = NULL;
(dn = of_find_node_by_name(dn,"interrupt-controller")) != NULL;) {
if (!device_is_compatible(dn,
"IBM,CBEA-Internal-Interrupt-Controller"))
continue;
np = get_property(dn, "ibm,interrupt-server-ranges", NULL);
if (np == NULL) {
if (np == NULL) {
printk(KERN_WARNING "IIC: CPU association not found\n");
of_node_put(dn);
return -ENODEV;
Expand Down

0 comments on commit e332790

Please sign in to comment.