From e99f2838f373b9f42ca5731b068d5563e2a7e38e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 25 Mar 2011 16:03:07 +0100 Subject: [PATCH] --- yaml --- r: 243335 b: refs/heads/master c: 8c99f561395f59ba9ec926c8940a4446fdfd8103 h: refs/heads/master i: 243333: a12cdd6f219f251b85d61ec1ee69abf846675b41 243331: ec56a3423e6f497f9cdd745b73d387aaa485bc31 243327: 2b791a9592e15fafe60b5c0b8fb97e27a3c39e9c v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/powermac/pic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3bdf30dc86d4..d847626f7203 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 212d786dabfee69c2ce5498821c2a0a679a1197b +refs/heads/master: 8c99f561395f59ba9ec926c8940a4446fdfd8103 diff --git a/trunk/arch/powerpc/platforms/powermac/pic.c b/trunk/arch/powerpc/platforms/powermac/pic.c index 22f45d74a584..4ce146fba59c 100644 --- a/trunk/arch/powerpc/platforms/powermac/pic.c +++ b/trunk/arch/powerpc/platforms/powermac/pic.c @@ -157,7 +157,7 @@ static unsigned int pmac_startup_irq(struct irq_data *d) int i = src >> 5; raw_spin_lock_irqsave(&pmac_pic_lock, flags); - if ((irq_to_desc(d->irq)->status & IRQ_LEVEL) == 0) + if (!irqd_is_level_type(d)) out_le32(&pmac_irq_hw[i]->ack, bit); __set_bit(src, ppc_cached_irq_mask); __pmac_set_irq_mask(src, 0);