Re: [tip:x86/irq] x86: apic: Fix mismerge, addarch_probe_nr_irqs() again

From: Ian Campbell
Date: Wed Mar 10 2010 - 05:55:54 EST


On Mon, 2010-03-01 at 13:58 -0800, Eric W. Biederman wrote:
>
> >> - Xen has an array irq_info[NR_IRQS] one of the last static arrays
> >> sized at NR_IRQs in the entire kernel.
> >
> > Hopefully the same info as is in that array could (and indeed
> should) be
> > instead stored in irq_desc->chip_data. Would you object to
> > arch_init_copy_chip_data and arch_free_chip_data becoming function
> > pointers within the struct irq_chip?
>
> No objections. Now that I see those methods it looks like they always
> should have been in irq_chip.

The following changes since commit c0a2d57e753717cc893b4b38bfb351c7f19469c3:
Ingo Molnar (1):
Merge branch 'perf/urgent'

are available in the git repository at:

git://xenbits.xensource.com/people/ianc/linux-2.6.git for-x86/irq

Ian Campbell (3):
x86: namespace some I/O APIC related structures and functions.
irq: move some interrupt arch_* functions into struct irq_chip.
x86: irq_desc->chip_data is always correct whether or not SPARSE_IRQ is enabled.

arch/powerpc/kernel/irq.c | 2 +-
arch/x86/include/asm/hw_irq.h | 25 +++--
arch/x86/kernel/apic/io_apic.c | 233 ++++++++++++++++++++++++---------------
arch/x86/kernel/uv_irq.c | 19 ++--
include/linux/interrupt.h | 2 +-
include/linux/irq.h | 12 ++-
kernel/irq/handle.c | 2 +-
kernel/irq/numa_migrate.c | 12 ++-
kernel/softirq.c | 3 +-
9 files changed, 195 insertions(+), 115 deletions(-)


--
Ian Campbell
Current Noise: Mistress - Lord Worm

Nothing is easier than to denounce the evildoer; nothing is more difficult
than to understand him.
-- Fyodor Dostoevski

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/