irq/core for v2.6.33
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
------------------>
Alexey Dobriyan (1):
genirq: switch /proc/irq/*/spurious to seq_file
Cyrill Gorcunov (1):
irq: Do not attempt to create subdirectories if /proc/irq/<irq> failed
Liuweni (1):
irq: Fix docbook comments
Michael Neuling (1):
irq: trivial: Fix typo in comment for #endif
Thomas Gleixner (2):
irq: Remove unused debug_poll_all_shared_irqs()
genirq: Fix spurious irq seqfile conversion
include/linux/interrupt.h | 6 ------ include/linux/irqflags.h | 2 +- kernel/irq/chip.c | 6 +++--- kernel/irq/proc.c | 40 ++++++++++++++++++++++++---------------- kernel/irq/spurious.c | 14 +------------- 5 files changed, 29 insertions(+), 39 deletions(-)
include/linux/interrupt.h +0 -6
@@ -603,12 +603,6 @@ static inline void init_irq_proc(void) }#endif -#if defined(CONFIG_GENERIC_HARDIRQS ) && defined(CONFIG_DEBUG_SHIRQ ) -extern void debug_poll_all_shared_irqs (void ); -#else -static inline void debug_poll_all_shared_irqs (void ) { } -#endif -struct seq_file ;int show_interrupts (struct seq_file *p,void *v);
include/linux/irqflags.h +1 -1
@@ -124,6 +124,6 @@ typecheck(unsigned long, flags); \raw_irqs_disabled_flags (flags); \ }) -#endif /* CONFIG_X86 */ +#endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */ #endif
kernel/irq/chip.c +3 -3
@@ -166,11 +166,11 @@ int set_irq_data(unsigned int irq, void *data)EXPORT_SYMBOL (set_irq_data);/** -* set_irq_data - set irq type data for an irq +* set_irq_msi - set MSI descriptor data for an irq * @irq: Interrupt number * @entry: Pointer to MSI descriptor data * -* Set the hardware irq controller data for an irq +* Set the MSI descriptor entry for an irq */ int set_irq_msi (unsigned int irq,struct msi_desc *entry) {
@@ -590,7 +590,7 @@ out_unlock: }/** -* handle_percpu_IRQ - Per CPU local irq handler +* handle_percpu_irq - Per CPU local irq handler * @irq: the interrupt number * @desc: the interrupt description structure for this irq *
kernel/irq/proc.c +24 -16
@@ -136,7 +136,7 @@ out:static int default_affinity_open (struct inode *inode,struct file *file) { -return single_open (file, default_affinity_show,NULL ); +return single_open (file, default_affinity_show,PDE (inode)->data); }static const struct file_operations default_affinity_proc_fops = {
@@ -148,18 +148,28 @@ static const struct file_operations default_affinity_proc_fops = { };#endif -static int irq_spurious_read (char *page,char **start,off_t off, -int count,int *eof,void *data) +static int irq_spurious_proc_show (struct seq_file *m,void *v) { -struct irq_desc *desc =irq_to_desc ((long ) data); -return sprintf (page,"count %u\n" -"unhandled %u\n" -"last_unhandled %u ms\n" , - desc->irq_count, - desc->irqs_unhandled, -jiffies_to_msecs (desc->last_unhandled)); +struct irq_desc *desc =irq_to_desc ((long ) m->private); + +seq_printf (m,"count %u\n" "unhandled %u\n" "last_unhandled %u ms\n" , + desc->irq_count, desc->irqs_unhandled, +jiffies_to_msecs (desc->last_unhandled)); +return 0 ; +} + +static int irq_spurious_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, irq_spurious_proc_show,NULL ); } +static const struct file_operations irq_spurious_proc_fops = { + .open = irq_spurious_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +#define MAX_NAMELEN 128static int name_unique (unsigned int irq,struct irqaction *new_action)
@@ -204,7 +214,6 @@ void register_handler_proc(unsigned int irq, struct irqaction *action)void register_irq_proc (unsigned int irq,struct irq_desc *desc) {char name [MAX_NAMELEN ]; -struct proc_dir_entry *entry;if (!root_irq_dir || (desc->chip == &no_irq_chip) || desc->dir)return ;
@@ -214,6 +223,8 @@ void register_irq_proc(unsigned int irq, struct irq_desc *desc)/* create /proc/irq/1234 */ desc->dir =proc_mkdir (name, root_irq_dir); +if (!desc->dir) +return ;#ifdef CONFIG_SMP /* create /proc/irq/<irq>/smp_affinity */
@@ -221,11 +232,8 @@ void register_irq_proc(unsigned int irq, struct irq_desc *desc) &irq_affinity_proc_fops, (void *)(long)irq);#endif - entry =create_proc_entry ("spurious" ,0444 , desc->dir); -if (entry) { - entry->data = (void *)(long )irq; - entry->read_proc = irq_spurious_read; - } +proc_create_data ("spurious" ,0444 , desc->dir, + &irq_spurious_proc_fops, (void *)(long )irq); }#undef MAX_NAMELEN
kernel/irq/spurious.c +1 -13
@@ -104,7 +104,7 @@ static int misrouted_irq(int irq)return ok; } -static void poll_all_shared_irqs (void ) +static void poll_spurious_irqs (unsigned long dummy) {struct irq_desc *desc;int i;
@@ -123,23 +123,11 @@ static void poll_all_shared_irqs(void)try_one_irq (i, desc); } -} - -static void poll_spurious_irqs (unsigned long dummy) -{ -poll_all_shared_irqs ();mod_timer (&poll_spurious_irq_timer, jiffies +POLL_SPURIOUS_IRQ_INTERVAL ); } -#ifdef CONFIG_DEBUG_SHIRQ -void debug_poll_all_shared_irqs (void ) -{ -poll_all_shared_irqs (); -} -#endif -/* * If 99,900 of the previous 100,000 interrupts have not been handled * then assume that the IRQ is stuck in some manner. Drop a diagnostic