irq/core for v2.6.32
Subsystems (3)
Linus,
Please pull the latest irq-core-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq-core-for-linus
Thanks,
Ingo
------------------>
Bartlomiej Zolnierkiewicz (1):
irq: Remove superfluous NULL pointer check in check_irq_resend()
Jiri Slaby (1):
irq: Clean up by removing irqfixup MODULE_PARM_DESC()
Mark Brown (1):
genirq: Add prototype for handle_nested_irq()
Rafael J. Wysocki (1):
genirq: Fix comment describing suspend_device_irqs()
Thomas Gleixner (1):
genirq: Remove obsolete defines and typedefs
Yinghai Lu (3):
irq: Make sure irq_desc for legacy irq get correct node setting
irq: Add irq_node() primitive
pci/intr_remapping: Allocate irq_iommu on node
Documentation/feature-removal-schedule.txt | 9 --------- drivers/pci/intr_remapping.c | 14 +++----------- include/linux/irq.h | 8 +------- include/linux/irqnr.h | 6 ++++++ kernel/irq/handle.c | 5 ++++- kernel/irq/pm.c | 8 ++++---- kernel/irq/resend.c | 3 +-- kernel/irq/spurious.c | 1 - 8 files changed, 19 insertions(+), 35 deletions(-)
Documentation/feature-removal-schedule.txt +0 -9
@@ -394,15 +394,6 @@ Who: Thomas Gleixner <[email protected]> ----------------------------- -What: obsolete generic irq defines and typedefs -When: 2.6.30 -Why: The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t) - have been kept around for migration reasons. After more than two years - it's time to remove them finally -Who: Thomas Gleixner <[email protected]> - ---------------------------- - What: fakephp and associated sysfs files in /sys/bus/pci/slots/ When: 2011 Why: In 2.6.27, the semantics of /sys/bus/pci/slots was redefined to
drivers/pci/intr_remapping.c +3 -11
@@ -55,15 +55,12 @@ static struct irq_2_iommu *irq_2_iommu(unsigned int irq)return desc->irq_2_iommu; } -static struct irq_2_iommu *irq_2_iommu_alloc_node (unsigned int irq,int node) +static struct irq_2_iommu *irq_2_iommu_alloc (unsigned int irq) {struct irq_desc *desc;struct irq_2_iommu *irq_iommu; -/* -* alloc irq desc if not allocated already. -*/ - desc =irq_to_desc_alloc_node (irq, node); + desc =irq_to_desc (irq);if (!desc) {printk (KERN_INFO "can not get irq_desc for %d\n" , irq);return NULL ;
@@ -72,16 +69,11 @@ static struct irq_2_iommu *irq_2_iommu_alloc_node(unsigned int irq, int node) irq_iommu = desc->irq_2_iommu;if (!irq_iommu) - desc->irq_2_iommu =get_one_free_irq_2_iommu (node); + desc->irq_2_iommu =get_one_free_irq_2_iommu (irq_node (irq)); return desc->irq_2_iommu; } -static struct irq_2_iommu *irq_2_iommu_alloc (unsigned int irq) -{ -return irq_2_iommu_alloc_node (irq,cpu_to_node (boot_cpu_id)); -} -#else /* !CONFIG_SPARSE_IRQ */ static struct irq_2_iommu irq_2_iommuX[NR_IRQS ];
include/linux/irq.h +1 -7
@@ -220,13 +220,6 @@ static inline struct irq_desc *move_irq_desc(struct irq_desc *desc, int node)extern struct irq_desc *irq_to_desc_alloc_node (unsigned int irq,int node);/* -* Migration helpers for obsolete names, they will go away: -*/ -#define hw_interrupt_type irq_chip -#define no_irq_type no_irq_chip -typedef struct irq_desc irq_desc_t ; - -/* * Pick up the arch-dependent methods: */ #include <asm/hw_irq.h>
@@ -289,6 +282,7 @@ extern void handle_edge_irq(unsigned int irq, struct irq_desc *desc);extern void handle_simple_irq (unsigned int irq,struct irq_desc *desc);extern void handle_percpu_irq (unsigned int irq,struct irq_desc *desc);extern void handle_bad_irq (unsigned int irq,struct irq_desc *desc); +extern void handle_nested_irq (unsigned int irq);/* * Monolithic do_IRQ implementation.
include/linux/irqnr.h +6 -0
@@ -41,6 +41,12 @@ extern struct irq_desc *irq_to_desc(unsigned int irq); ; \ else +#ifdef CONFIG_SMP +#define irq_node (irq) (irq_to_desc(irq)->node) +#else +#define irq_node (irq) 0 +#endif +#endif /* CONFIG_GENERIC_HARDIRQS */ #define for_each_irq_nr (irq) \
kernel/irq/handle.c +4 -1
@@ -161,7 +161,7 @@ int __init early_irq_init(void) desc = irq_desc_legacy; legacy_count =ARRAY_SIZE (irq_desc_legacy); - node = first_online_node; + node = first_online_node;/* allocate irq_desc_ptrs array based on nr_irqs */ irq_desc_ptrs =kcalloc (nr_irqs,sizeof (void *),GFP_NOWAIT );
@@ -172,6 +172,9 @@ int __init early_irq_init(void)for (i =0 ; i < legacy_count; i++) { desc[i].irq = i; +#ifdef CONFIG_SMP + desc[i].node = node; +#endif desc[i].kstat_irqs = kstat_irqs_legacy + i * nr_cpu_ids;lockdep_set_class (&desc[i].lock, &irq_desc_lock_class);alloc_desc_masks (&desc[i], node, true);
kernel/irq/pm.c +4 -4
@@ -15,10 +15,10 @@/** * suspend_device_irqs - disable all currently enabled interrupt lines * -* During system-wide suspend or hibernation device interrupts need to be -* disabled at the chip level and this function is provided for this purpose. -* It disables all interrupt lines that are enabled at the moment and sets the -* IRQ_SUSPENDED flag for them. +* During system-wide suspend or hibernation device drivers need to be prevented +* from receiving interrupts and this function is provided for this purpose. +* It marks all interrupt lines in use, except for the timer ones, as disabled +* and sets the IRQ_SUSPENDED flag for each of them. */ void suspend_device_irqs (void ) {
kernel/irq/resend.c +1 -2
@@ -70,8 +70,7 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)if ((status & (IRQ_LEVEL |IRQ_PENDING |IRQ_REPLAY )) ==IRQ_PENDING ) { desc->status = (status & ~IRQ_PENDING ) |IRQ_REPLAY ; -if (!desc->chip || !desc->chip->retrigger || - !desc->chip->retrigger (irq)) { +if (!desc->chip->retrigger || !desc->chip->retrigger (irq)) {#ifdef CONFIG_HARDIRQS_SW_RESEND /* Set it pending and activate the softirq: */ set_bit (irq, irqs_resend);
kernel/irq/spurious.c +0 -1
@@ -297,7 +297,6 @@ static int __init irqfixup_setup(char *str)__setup ("irqfixup" , irqfixup_setup);module_param (irqfixup, int,0644 ); -MODULE_PARM_DESC ("irqfixup" ,"0: No fixup, 1: irqfixup mode, 2: irqpoll mode" );static int __init irqpoll_setup (char *str) {