diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-09 10:57:57 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-09 10:57:57 +1000 |
| commit | ea4e89afedc7fc64078076eacbcffaaa742baf0d (patch) | |
| tree | 1e4a14dd1ada2eff8d1cb4d76bf9e337e079845e /arch/powerpc/platforms/powermac | |
| parent | 43671cc96e58458b2711f1e97ff24a4c0e7cd1ac (diff) | |
| parent | a3512b2dd57cb653bb33645ca9c934436e547e3c (diff) | |
| download | linux-ea4e89afedc7fc64078076eacbcffaaa742baf0d.tar.gz linux-ea4e89afedc7fc64078076eacbcffaaa742baf0d.tar.bz2 linux-ea4e89afedc7fc64078076eacbcffaaa742baf0d.zip | |
Merge branch 'merge' into next
Diffstat (limited to 'arch/powerpc/platforms/powermac')
| -rw-r--r-- | arch/powerpc/platforms/powermac/pic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c index 66ad93de1d55..c4e630576ff2 100644 --- a/arch/powerpc/platforms/powermac/pic.c +++ b/arch/powerpc/platforms/powermac/pic.c @@ -57,9 +57,9 @@ static int max_real_irqs; static DEFINE_RAW_SPINLOCK(pmac_pic_lock); -#define NR_MASK_WORDS ((NR_IRQS + 31) / 32) -static unsigned long ppc_lost_interrupts[NR_MASK_WORDS]; -static unsigned long ppc_cached_irq_mask[NR_MASK_WORDS]; +/* The max irq number this driver deals with is 128; see max_irqs */ +static DECLARE_BITMAP(ppc_lost_interrupts, 128); +static DECLARE_BITMAP(ppc_cached_irq_mask, 128); static int pmac_irq_cascade = -1; static struct irq_domain *pmac_pic_host; |