From 57fc103973a15a05c164bd184f33e5a0aa68557c Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 25 Mar 2011 14:21:16 +0000 Subject: [PATCH] --- yaml --- r: 242983 b: refs/heads/master c: 1919d641e69eff2d1443e1ca9430f394f2e78699 h: refs/heads/master i: 242981: b1511dd3da911d386d65bbfaf3176b50c34bc01f 242979: b6ea48f980f881f90c6cb5d11d01166dd183a5aa 242975: f0af1cb00257ecc77fed53a9f111ff8f29015294 v: v3 --- [refs] | 2 +- trunk/arch/tile/kernel/irq.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ffcb2b2aa6e4..97e898ae9421 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a03513825db4db57fa93821a0c04dbbb39a68e6 +refs/heads/master: 1919d641e69eff2d1443e1ca9430f394f2e78699 diff --git a/trunk/arch/tile/kernel/irq.c b/trunk/arch/tile/kernel/irq.c index 0baa7580121f..83302826239b 100644 --- a/trunk/arch/tile/kernel/irq.c +++ b/trunk/arch/tile/kernel/irq.c @@ -241,14 +241,14 @@ void tile_irq_activate(unsigned int irq, int tile_irq_type) irq_flow_handler_t handle = handle_level_irq; if (tile_irq_type == TILE_IRQ_PERCPU) handle = handle_percpu_irq; - set_irq_chip_and_handler(irq, &tile_irq_chip, handle); + irq_set_chip_and_handler(irq, &tile_irq_chip, handle); /* * Flag interrupts that are hardware-cleared so that ack() * won't clear them. */ if (tile_irq_type == TILE_IRQ_HW_CLEAR) - set_irq_chip_data(irq, (void *)IS_HW_CLEARED); + irq_set_chip_data(irq, (void *)IS_HW_CLEARED); } EXPORT_SYMBOL(tile_irq_activate); @@ -290,7 +290,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)