From dfbaf2dd732393bacd7c22c60ad177fd07b320fb Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 24 Mar 2011 18:24:42 +0100 Subject: [PATCH] --- yaml --- r: 242542 b: refs/heads/master c: 0ebec35f683c4e94e4bfb877b71598e79b131638 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/kernel/irq.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 01256bc8014d..a822108ae641 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bdab7e0305383ce1126f43f46262f00a265d802 +refs/heads/master: 0ebec35f683c4e94e4bfb877b71598e79b131638 diff --git a/trunk/arch/um/kernel/irq.c b/trunk/arch/um/kernel/irq.c index 64cfea80cfe2..d76d8c8ded56 100644 --- a/trunk/arch/um/kernel/irq.c +++ b/trunk/arch/um/kernel/irq.c @@ -48,7 +48,7 @@ int show_interrupts(struct seq_file *p, void *v) for_each_online_cpu(j) seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); #endif - seq_printf(p, " %14s", get_irq_desc_chip(desc)->name); + seq_printf(p, " %14s", irq_desc_get_chip(desc)->name); seq_printf(p, " %s", action->name); for (action=action->next; action; action = action->next) @@ -390,11 +390,10 @@ void __init init_IRQ(void) { int i; - set_irq_chip_and_handler(TIMER_IRQ, &SIGVTALRM_irq_type, handle_edge_irq); + irq_set_chip_and_handler(TIMER_IRQ, &SIGVTALRM_irq_type, handle_edge_irq); - for (i = 1; i < NR_IRQS; i++) { - set_irq_chip_and_handler(i, &normal_irq_type, handle_edge_irq); - } + for (i = 1; i < NR_IRQS; i++) + irq_set_chip_and_handler(i, &normal_irq_type, handle_edge_irq); } /*