diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-02 02:05:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-02 02:05:42 -0400 |
| commit | f407a8258610169cd8e975dba7f0b2824562014c (patch) | |
| tree | 6c87b2d168a4665411a9e16b9f481599f2db25bc /arch/mips/kernel/irq.c | |
| parent | 960d447b94b22ceba286917056871d1dac8da697 (diff) | |
| parent | c46a024ea5eb0165114dbbc8c82c29b7bcf66e71 (diff) | |
Merge branch 'linus' into sched/core, to resolve conflict
Conflicts:
arch/sparc/include/asm/topology_64.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/kernel/irq.c')
| -rw-r--r-- | arch/mips/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index d2bfbc2e8995..51f57d841662 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | int kgdb_early_setup; | 29 | int kgdb_early_setup; |
| 30 | #endif | 30 | #endif |
| 31 | 31 | ||
| 32 | static unsigned long irq_map[NR_IRQS / BITS_PER_LONG]; | 32 | static DECLARE_BITMAP(irq_map, NR_IRQS); |
| 33 | 33 | ||
| 34 | int allocate_irqno(void) | 34 | int allocate_irqno(void) |
| 35 | { | 35 | { |