Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent

20 files changed, 47 insertions, 90 deletions

diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index a19d60082299..381431a2d6d9 100644
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -67,68 +67,21 @@ int irq_select_affinity(unsigned int irq)
 }
 #endif /* CONFIG_SMP */
 
-int
-show_interrupts(struct seq_file *p, void *v)
+int arch_show_interrupts(struct seq_file *p, int prec)
 {
         int j;
-        int irq = *(loff_t *) v;
-        struct irqaction * action;
-        struct irq_desc *desc;
-        unsigned long flags;
 
 #ifdef CONFIG_SMP
-        if (irq == 0) {
-                seq_puts(p, "           ");
-                for_each_online_cpu(j)
-                        seq_printf(p, "CPU%d       ", j);
-                seq_putc(p, '\n');
-        }
-#endif
-
-        if (irq < ACTUAL_NR_IRQS) {
-                desc = irq_to_desc(irq);
-
-                if (!desc)
-                        return 0;
-
-                raw_spin_lock_irqsave(&desc->lock, flags);
-                action = desc->action;
-                if (!action) 
-                        goto unlock;
-                seq_printf(p, "%3d: ", irq);
-#ifndef CONFIG_SMP
-                seq_printf(p, "%10u ", kstat_irqs(irq));
-#else
-                for_each_online_cpu(j)
-                        seq_printf(p, "%10u ", kstat_irqs_cpu(irq, j));
+        seq_puts(p, "IPI: ");
+        for_each_online_cpu(j)
+                seq_printf(p, "%10lu ", cpu_data[j].ipi_count);
+        seq_putc(p, '\n');
 #endif
-                seq_printf(p, " %14s", get_irq_desc_chip(desc)->name);
-                seq_printf(p, "  %c%s",
-                        (action->flags & IRQF_DISABLED)?'+':' ',
-                        action->name);
-
-                for (action=action->next; action; action = action->next) {
-                        seq_printf(p, ", %c%s",
-                                  (action->flags & IRQF_DISABLED)?'+':' ',
-                                   action->name);
-                }
-
-                seq_putc(p, '\n');
-unlock:
-                raw_spin_unlock_irqrestore(&desc->lock, flags);
-        } else if (irq == ACTUAL_NR_IRQS) {
-#ifdef CONFIG_SMP
-                seq_puts(p, "IPI: ");
-                for_each_online_cpu(j)
-                        seq_printf(p, "%10lu ", cpu_data[j].ipi_count);
-                seq_putc(p, '\n');
-#endif
-                seq_puts(p, "PMI: ");
-                for_each_online_cpu(j)
-                        seq_printf(p, "%10lu ", per_cpu(irq_pmi_count, j));
-                seq_puts(p, "          Performance Monitoring\n");
-                seq_printf(p, "ERR: %10lu\n", irq_err_count);
-        }
+        seq_puts(p, "PMI: ");
+        for_each_online_cpu(j)
+                seq_printf(p, "%10lu ", per_cpu(irq_pmi_count, j));
+        seq_puts(p, "          Performance Monitoring\n");
+        seq_printf(p, "ERR: %10lu\n", irq_err_count);
         return 0;
 }
 
diff --git a/arch/alpha/kernel/irq_alpha.c b/arch/alpha/kernel/irq_alpha.c
index 411ca11d0a18..1479dc6ebd97 100644
--- a/arch/alpha/kernel/irq_alpha.c
+++ b/arch/alpha/kernel/irq_alpha.c
@@ -228,7 +228,7 @@ struct irqaction timer_irqaction = {
 void __init
 init_rtc_irq(void)
 {
-        set_irq_chip_and_handler_name(RTC_IRQ, &no_irq_chip,
+        irq_set_chip_and_handler_name(RTC_IRQ, &no_irq_chip,
                                       handle_simple_irq, "RTC");
         setup_irq(RTC_IRQ, &timer_irqaction);
 }
diff --git a/arch/alpha/kernel/irq_i8259.c b/arch/alpha/kernel/irq_i8259.c
index c7cc9813e45f..e1861c77dabc 100644
--- a/arch/alpha/kernel/irq_i8259.c
+++ b/arch/alpha/kernel/irq_i8259.c
@@ -92,7 +92,7 @@ init_i8259a_irqs(void)
         outb(0xff, 0xA1);       /* mask all of 8259A-2 */
 
         for (i = 0; i < 16; i++) {
-                set_irq_chip_and_handler(i, &i8259a_irq_type, handle_level_irq);
+                irq_set_chip_and_handler(i, &i8259a_irq_type, handle_level_irq);
         }
 
         setup_irq(2, &cascade);
diff --git a/arch/alpha/kernel/irq_pyxis.c b/arch/alpha/kernel/irq_pyxis.c
index b30227fa7f5f..13c97a5b31e8 100644
--- a/arch/alpha/kernel/irq_pyxis.c
+++ b/arch/alpha/kernel/irq_pyxis.c
@@ -102,7 +102,7 @@ init_pyxis_irqs(unsigned long ignore_mask)
         for (i = 16; i < 48; ++i) {
                 if ((ignore_mask >> i) & 1)
                         continue;
-                set_irq_chip_and_handler(i, &pyxis_irq_type, handle_level_irq);
+                irq_set_chip_and_handler(i, &pyxis_irq_type, handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 
diff --git a/arch/alpha/kernel/irq_srm.c b/arch/alpha/kernel/irq_srm.c
index 82a47bba41c4..a79fa30e7552 100644
--- a/arch/alpha/kernel/irq_srm.c
+++ b/arch/alpha/kernel/irq_srm.c
@@ -51,7 +51,7 @@ init_srm_irqs(long max, unsigned long ignore_mask)
         for (i = 16; i < max; ++i) {
                 if (i < 64 && ((ignore_mask >> i) & 1))
                         continue;
-                set_irq_chip_and_handler(i, &srm_irq_type, handle_level_irq);
+                irq_set_chip_and_handler(i, &srm_irq_type, handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 }
diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index 88d95e872f55..0e1439904cdb 100644
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -125,7 +125,7 @@ alcor_init_irq(void)
                    on while IRQ probing.  */
                 if (i >= 16+20 && i <= 16+30)
                         continue;
-                set_irq_chip_and_handler(i, &alcor_irq_type, handle_level_irq);
+                irq_set_chip_and_handler(i, &alcor_irq_type, handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
         i8259a_irq_type.irq_ack = alcor_isa_mask_and_ack_irq;
diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c
index 57eb6307bc27..c8c112d51584 100644
--- a/arch/alpha/kernel/sys_cabriolet.c
+++ b/arch/alpha/kernel/sys_cabriolet.c
@@ -105,8 +105,8 @@ common_init_irq(void (*srm_dev_int)(unsigned long v))
                 outb(0xff, 0x806);
 
                 for (i = 16; i < 35; ++i) {
-                        set_irq_chip_and_handler(i, &cabriolet_irq_type,
-                                handle_level_irq);
+                        irq_set_chip_and_handler(i, &cabriolet_irq_type,
+                                                 handle_level_irq);
                         irq_set_status_flags(i, IRQ_LEVEL);
                 }
         }
diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c
index 481df4ecb651..5ac00fd4cd0c 100644
--- a/arch/alpha/kernel/sys_dp264.c
+++ b/arch/alpha/kernel/sys_dp264.c
@@ -270,7 +270,7 @@ init_tsunami_irqs(struct irq_chip * ops, int imin, int imax)
 {
         long i;
         for (i = imin; i <= imax; ++i) {
-                set_irq_chip_and_handler(i, ops, handle_level_irq);
+                irq_set_chip_and_handler(i, ops, handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 }
diff --git a/arch/alpha/kernel/sys_eb64p.c b/arch/alpha/kernel/sys_eb64p.c
index 402e908ffb3e..a7a23b40eec5 100644
--- a/arch/alpha/kernel/sys_eb64p.c
+++ b/arch/alpha/kernel/sys_eb64p.c
@@ -118,7 +118,7 @@ eb64p_init_irq(void)
         init_i8259a_irqs();
 
         for (i = 16; i < 32; ++i) {
-                set_irq_chip_and_handler(i, &eb64p_irq_type, handle_level_irq);
+                irq_set_chip_and_handler(i, &eb64p_irq_type, handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 
diff --git a/arch/alpha/kernel/sys_eiger.c b/arch/alpha/kernel/sys_eiger.c
index 0b44a54c1522..a60cd5b2621e 100644
--- a/arch/alpha/kernel/sys_eiger.c
+++ b/arch/alpha/kernel/sys_eiger.c
@@ -138,7 +138,7 @@ eiger_init_irq(void)
         init_i8259a_irqs();
 
         for (i = 16; i < 128; ++i) {
-                set_irq_chip_and_handler(i, &eiger_irq_type, handle_level_irq);
+                irq_set_chip_and_handler(i, &eiger_irq_type, handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 }
diff --git a/arch/alpha/kernel/sys_jensen.c b/arch/alpha/kernel/sys_jensen.c
index 00341b75c8b2..7f1a87f176e2 100644
--- a/arch/alpha/kernel/sys_jensen.c
+++ b/arch/alpha/kernel/sys_jensen.c
@@ -171,11 +171,11 @@ jensen_init_irq(void)
 {
         init_i8259a_irqs();
 
-        set_irq_chip_and_handler(1, &jensen_local_irq_type, handle_level_irq);
-        set_irq_chip_and_handler(4, &jensen_local_irq_type, handle_level_irq);
-        set_irq_chip_and_handler(3, &jensen_local_irq_type, handle_level_irq);
-        set_irq_chip_and_handler(7, &jensen_local_irq_type, handle_level_irq);
-        set_irq_chip_and_handler(9, &jensen_local_irq_type, handle_level_irq);
+        irq_set_chip_and_handler(1, &jensen_local_irq_type, handle_level_irq);
+        irq_set_chip_and_handler(4, &jensen_local_irq_type, handle_level_irq);
+        irq_set_chip_and_handler(3, &jensen_local_irq_type, handle_level_irq);
+        irq_set_chip_and_handler(7, &jensen_local_irq_type, handle_level_irq);
+        irq_set_chip_and_handler(9, &jensen_local_irq_type, handle_level_irq);
 
         common_init_isa_dma();
 }
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index e61910734e41..388b99d1779d 100644
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -276,7 +276,7 @@ init_io7_irqs(struct io7 *io7,
 
         /* Set up the lsi irqs.  */
         for (i = 0; i < 128; ++i) {
-                set_irq_chip_and_handler(base + i, lsi_ops, handle_level_irq);
+                irq_set_chip_and_handler(base + i, lsi_ops, handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 
@@ -290,7 +290,7 @@ init_io7_irqs(struct io7 *io7,
 
         /* Set up the msi irqs.  */
         for (i = 128; i < (128 + 512); ++i) {
-                set_irq_chip_and_handler(base + i, msi_ops, handle_level_irq);
+                irq_set_chip_and_handler(base + i, msi_ops, handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 
@@ -308,8 +308,8 @@ marvel_init_irq(void)
 
         /* Reserve the legacy irqs.  */
         for (i = 0; i < 16; ++i) {
-                set_irq_chip_and_handler(i, &marvel_legacy_irq_type,
-                        handle_level_irq);
+                irq_set_chip_and_handler(i, &marvel_legacy_irq_type,
+                                         handle_level_irq);
         }
 
         /* Init the io7 irqs.  */
diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c
index cf7f43dd3147..0e6e4697a025 100644
--- a/arch/alpha/kernel/sys_mikasa.c
+++ b/arch/alpha/kernel/sys_mikasa.c
@@ -98,7 +98,8 @@ mikasa_init_irq(void)
         mikasa_update_irq_hw(0);
 
         for (i = 16; i < 32; ++i) {
-                set_irq_chip_and_handler(i, &mikasa_irq_type, handle_level_irq);
+                irq_set_chip_and_handler(i, &mikasa_irq_type,
+                                         handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 
diff --git a/arch/alpha/kernel/sys_noritake.c b/arch/alpha/kernel/sys_noritake.c
index 92bc188e94a9..a00ac7087167 100644
--- a/arch/alpha/kernel/sys_noritake.c
+++ b/arch/alpha/kernel/sys_noritake.c
@@ -127,7 +127,8 @@ noritake_init_irq(void)
         outw(0, 0x54c);
 
         for (i = 16; i < 48; ++i) {
-                set_irq_chip_and_handler(i, &noritake_irq_type, handle_level_irq);
+                irq_set_chip_and_handler(i, &noritake_irq_type,
+                                         handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 
diff --git a/arch/alpha/kernel/sys_rawhide.c b/arch/alpha/kernel/sys_rawhide.c
index 936d4140ed5f..7f52161f3d88 100644
--- a/arch/alpha/kernel/sys_rawhide.c
+++ b/arch/alpha/kernel/sys_rawhide.c
@@ -180,7 +180,8 @@ rawhide_init_irq(void)
         }
 
         for (i = 16; i < 128; ++i) {
-                set_irq_chip_and_handler(i, &rawhide_irq_type, handle_level_irq);
+                irq_set_chip_and_handler(i, &rawhide_irq_type,
+                                         handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 
diff --git a/arch/alpha/kernel/sys_rx164.c b/arch/alpha/kernel/sys_rx164.c
index cea22a62913b..216d94d9c0c1 100644
--- a/arch/alpha/kernel/sys_rx164.c
+++ b/arch/alpha/kernel/sys_rx164.c
@@ -99,7 +99,7 @@ rx164_init_irq(void)
 
         rx164_update_irq_hw(0);
         for (i = 16; i < 40; ++i) {
-                set_irq_chip_and_handler(i, &rx164_irq_type, handle_level_irq);
+                irq_set_chip_and_handler(i, &rx164_irq_type, handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 
diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c
index a349538aabc9..da714e427c5f 100644
--- a/arch/alpha/kernel/sys_sable.c
+++ b/arch/alpha/kernel/sys_sable.c
@@ -518,8 +518,8 @@ sable_lynx_init_irq(int nr_of_irqs)
         long i;
 
         for (i = 0; i < nr_of_irqs; ++i) {
-                set_irq_chip_and_handler(i, &sable_lynx_irq_type,
-                        handle_level_irq);
+                irq_set_chip_and_handler(i, &sable_lynx_irq_type,
+                                         handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 
diff --git a/arch/alpha/kernel/sys_takara.c b/arch/alpha/kernel/sys_takara.c
index 42a5331f13c4..a31f8cd9bd6b 100644
--- a/arch/alpha/kernel/sys_takara.c
+++ b/arch/alpha/kernel/sys_takara.c
@@ -138,7 +138,8 @@ takara_init_irq(void)
                 takara_update_irq_hw(i, -1);
 
         for (i = 16; i < 128; ++i) {
-                set_irq_chip_and_handler(i, &takara_irq_type, handle_level_irq);
+                irq_set_chip_and_handler(i, &takara_irq_type,
+                                         handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c
index 8c13a0c77830..fea0e4620994 100644
--- a/arch/alpha/kernel/sys_titan.c
+++ b/arch/alpha/kernel/sys_titan.c
@@ -179,7 +179,7 @@ init_titan_irqs(struct irq_chip * ops, int imin, int imax)
 {
         long i;
         for (i = imin; i <= imax; ++i) {
-                set_irq_chip_and_handler(i, ops, handle_level_irq);
+                irq_set_chip_and_handler(i, ops, handle_level_irq);
                 irq_set_status_flags(i, IRQ_LEVEL);
         }
 }
diff --git a/arch/alpha/kernel/sys_wildfire.c b/arch/alpha/kernel/sys_wildfire.c
index ca60a387ef0a..d3cb28bb8eb0 100644
--- a/arch/alpha/kernel/sys_wildfire.c
+++ b/arch/alpha/kernel/sys_wildfire.c
@@ -183,17 +183,17 @@ wildfire_init_irq_per_pca(int qbbno, int pcano)
         for (i = 0; i < 16; ++i) {
                 if (i == 2)
                         continue;
-                set_irq_chip_and_handler(i+irq_bias, &wildfire_irq_type,
-                        handle_level_irq);
+                irq_set_chip_and_handler(i + irq_bias, &wildfire_irq_type,
+                                         handle_level_irq);
                 irq_set_status_flags(i + irq_bias, IRQ_LEVEL);
         }
 
-        set_irq_chip_and_handler(36+irq_bias, &wildfire_irq_type,
-                handle_level_irq);
+        irq_set_chip_and_handler(36 + irq_bias, &wildfire_irq_type,
+                                 handle_level_irq);
         irq_set_status_flags(36 + irq_bias, IRQ_LEVEL);
         for (i = 40; i < 64; ++i) {
-                set_irq_chip_and_handler(i+irq_bias, &wildfire_irq_type,
-                        handle_level_irq);
+                irq_set_chip_and_handler(i + irq_bias, &wildfire_irq_type,
+                                         handle_level_irq);
                 irq_set_status_flags(i + irq_bias, IRQ_LEVEL);
         }