Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

* 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (32 commits)
  x86: disable __do_IRQ support
  sparseirq, powerpc/cell: fix unused variable warning in interrupt.c
  genirq: deprecate obsolete typedefs and defines
  genirq: deprecate __do_IRQ
  genirq: add doc to struct irqaction
  genirq: use kzalloc instead of explicit zero initialization
  genirq: make irqreturn_t an enum
  genirq: remove redundant if condition
  genirq: remove unused hw_irq_controller typedef
  irq: export remove_irq() and setup_irq() symbols
  irq: match remove_irq() args with setup_irq()
  irq: add remove_irq() for freeing of setup_irq() irqs
  genirq: assert that irq handlers are indeed running in hardirq context
  irq: name 'p' variables a bit better
  irq: further clean up the free_irq() code flow
  irq: refactor and clean up the free_irq() code flow
  irq: clean up manage.c
  irq: use GFP_KERNEL for action allocation in request_irq()
  kernel/irq: fix sparse warning: make symbol static
  irq: optimize init_kstat_irqs/init_copy_kstat_irqs
  ...

diff --combined Documentation/feature-removal-schedule.txt
index 802c6fd20c635b26aa87d997a56a4d44ad095aa7,9aa1dda5d38c1560a42901156bef201e8f2b07a6..e47c0ff8ba7aaf59d8d6fa8776ab331b9c5c25b6
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -229,9 -229,7 +229,9 @@@ Who:       Jan Engelhardt <jengelh@computergm
  ---------------------------
  
  What: b43 support for firmware revision < 410
 -When: July 2008
 +When: The schedule was July 2008, but it was decided that we are going to keep the
 +        code as long as there are no major maintanance headaches.
 +      So it _could_ be removed _any_ time now, if it conflicts with something new.
  Why:  The support code for the old firmware hurts code readability/maintainability
        and slightly hurts runtime performance. Bugfixes for the old firmware
        are not provided by Broadcom anymore.
@@@ -346,3 -344,20 +346,20 @@@ Why:     See commits 129f8ae9b1b5be94517da7
        Removal is subject to fixing any remaining bugs in ACPI which may
        cause the thermal throttling not to happen at the right time.
  Who:  Dave Jones <davej@redhat.com>, Matthew Garrett <mjg@redhat.com>
+ 
+ -----------------------------
+ 
+ What: __do_IRQ all in one fits nothing interrupt handler
+ When: 2.6.32
+ Why:  __do_IRQ was kept for easy migration to the type flow handlers.
+       More than two years of migration time is enough.
+ Who:  Thomas Gleixner <tglx@linutronix.de>
+ 
+ -----------------------------
+ 
+ What: obsolete generic irq defines and typedefs
+ When: 2.6.30
+ Why:  The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t)
+       have been kept around for migration reasons. After more than two years
+       it's time to remove them finally
+ Who:  Thomas Gleixner <tglx@linutronix.de>

diff --combined arch/sh/kernel/irq.c
index 90d63aefd2755907d66932d42e4ac30629d277b5,0080a1607aae24ccfad419aecaa74eb4f3b8f426..3f1372eb0091f69ab93fb0912a3162c143d164f5
--- 1/arch/sh/kernel/irq.c
--- 2/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@@ -51,7 -51,7 +51,7 @@@ int show_interrupts(struct seq_file *p
                        goto unlock;
                seq_printf(p, "%3d: ",i);
                for_each_online_cpu(j)
-                       seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
+                       seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
                seq_printf(p, " %14s", irq_desc[i].chip->name);
                seq_printf(p, "-%-8s", irq_desc[i].name);
                seq_printf(p, "  %s", action->name);
@@@ -106,7 -106,7 +106,7 @@@ asmlinkage int do_IRQ(unsigned int irq
        }
  #endif
  
 -      irq = irq_demux(evt2irq(irq));
 +      irq = irq_demux(intc_evt2irq(irq));
  
  #ifdef CONFIG_IRQSTACKS
        curctx = (union irq_ctx *)current_thread_info();