irq fixes
Linus,
Please pull the latest irq-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq-fixes-for-linus
Thanks,
Ingo
------------------>
Chris Friesen (1):
genirq: fix set_irq_type() when recording trigger type
Dean Nelson (1):
genirq: NULL struct irq_desc's member 'name' in dynamic_irq_cleanup()
Ingo Molnar (1):
genirq: fix off by one and coding style
arch/x86/kernel/irq.c | 4 ++-- include/linux/irqnr.h | 6 +++--- kernel/irq/chip.c | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-)
arch/x86/kernel/irq.c +2 -2
@@ -36,7 +36,7 @@ void ack_bad_irq(unsigned int irq) }#ifdef CONFIG_X86_32 -# define irq_stats (x) (&per_cpu(irq_stat,x)) +# define irq_stats (x) (&per_cpu(irq_stat, x))#else # define irq_stats (x) cpu_pda(x)#endif
@@ -113,7 +113,7 @@ int show_interrupts(struct seq_file *p, void *v)if (i ==0 ) {seq_printf (p," " );for_each_online_cpu (j) -seq_printf (p,"CPU%-8d" ,j); +seq_printf (p,"CPU%-8d" , j);seq_putc (p,'\n' ); }
include/linux/irqnr.h +3 -3
@@ -13,9 +13,9 @@ extern int nr_irqs;# define for_each_irq_desc (irq, desc) \ for (irq = 0, desc = irq_desc; irq < nr_irqs; irq++, desc++) -# define for_each_irq_desc_reverse (irq, desc) \ - for (irq = nr_irqs -1, desc = irq_desc + (nr_irqs -1 ); \ - irq > 0; irq--, desc--) +# define for_each_irq_desc_reverse (irq, desc) \ + for (irq = nr_irqs - 1, desc = irq_desc + (nr_irqs - 1); \ + irq >= 0; irq--, desc--)#endif #define for_each_irq_nr (irq) \
kernel/irq/chip.c +2 -1
@@ -76,6 +76,7 @@ void dynamic_irq_cleanup(unsigned int irq) desc->chip_data =NULL ; desc->handle_irq = handle_bad_irq; desc->chip = &no_irq_chip; + desc->name =NULL ;spin_unlock_irqrestore (&desc->lock, flags); }
@@ -127,7 +128,7 @@ int set_irq_type(unsigned int irq, unsigned int type)return 0 ;spin_lock_irqsave (&desc->lock, flags); - ret =__irq_set_trigger (desc, irq, flags); + ret =__irq_set_trigger (desc, irq, type);spin_unlock_irqrestore (&desc->lock, flags);return ret; }