Merge branch 'irq-core-for-linus' of...
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (116 commits) x86: Enable forced interrupt threading support x86: Mark low level interrupts IRQF_NO_THREAD x86: Use generic show_interrupts x86: ioapic: Avoid redundant lookup of irq_cfg x86: ioapic: Use new move_irq functions x86: Use the proper accessors in fixup_irqs() x86: ioapic: Use irq_data->state x86: ioapic: Simplify irq chip and handler setup x86: Cleanup the genirq name space genirq: Add chip flag to force mask on suspend genirq: Add desc->irq_data accessor genirq: Add comments to Kconfig switches genirq: Fixup fasteoi handler for oneshot mode genirq: Provide forced interrupt threading sched: Switch wait_task_inactive to schedule_hrtimeout() genirq: Add IRQF_NO_THREAD genirq: Allow shared oneshot interrupts genirq: Prepare the handling of shared oneshot interrupts genirq: Make warning in handle_percpu_event useful x86: ioapic: Move trigger defines to io_apic.h ... Fix up trivial(?) conflicts in arch/x86/pci/xen.c due to genirq name space changes clashing with the Xen cleanups. The set_irq_msi() had moved to xen_bind_pirq_msi_to_irq().
No related branches found
No related tags found
Showing
- Documentation/kernel-parameters.txt 4 additions, 0 deletionsDocumentation/kernel-parameters.txt
- arch/x86/Kconfig 3 additions, 1 deletionarch/x86/Kconfig
- arch/x86/include/asm/apicdef.h 12 additions, 0 deletionsarch/x86/include/asm/apicdef.h
- arch/x86/include/asm/io_apic.h 28 additions, 16 deletionsarch/x86/include/asm/io_apic.h
- arch/x86/kernel/apic/apic.c 3 additions, 2 deletionsarch/x86/kernel/apic/apic.c
- arch/x86/kernel/apic/io_apic.c 169 additions, 219 deletionsarch/x86/kernel/apic/io_apic.c
- arch/x86/kernel/hpet.c 1 addition, 1 deletionarch/x86/kernel/hpet.c
- arch/x86/kernel/i8259.c 1 addition, 1 deletionarch/x86/kernel/i8259.c
- arch/x86/kernel/irq.c 16 additions, 66 deletionsarch/x86/kernel/irq.c
- arch/x86/kernel/irqinit.c 3 additions, 1 deletionarch/x86/kernel/irqinit.c
- arch/x86/kernel/smpboot.c 10 additions, 1 deletionarch/x86/kernel/smpboot.c
- arch/x86/lguest/boot.c 2 additions, 2 deletionsarch/x86/lguest/boot.c
- arch/x86/platform/uv/uv_irq.c 2 additions, 2 deletionsarch/x86/platform/uv/uv_irq.c
- arch/x86/platform/visws/visws_quirks.c 3 additions, 1 deletionarch/x86/platform/visws/visws_quirks.c
- drivers/xen/events.c 1 addition, 1 deletiondrivers/xen/events.c
- include/linux/interrupt.h 56 additions, 19 deletionsinclude/linux/interrupt.h
- include/linux/irq.h 298 additions, 70 deletionsinclude/linux/irq.h
- include/linux/irqdesc.h 73 additions, 5 deletionsinclude/linux/irqdesc.h
- kernel/irq/Kconfig 29 additions, 10 deletionskernel/irq/Kconfig
- kernel/irq/autoprobe.c 22 additions, 32 deletionskernel/irq/autoprobe.c
Loading
Please register or sign in to comment