Commit a8416961 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-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
  ...
parents 6671de34 fc2869f6

Documentation/DocBook/genericirq.tmpl

+1 −0
Original line number Original line Diff line number Diff line
@@ -440,6 +440,7 @@ desc->chip->end(); 
     used in the generic IRQ layer.

     used in the generic IRQ layer.

     </para>

     </para>

!Iinclude/linux/irq.h

!Iinclude/linux/irq.h

!Iinclude/linux/interrupt.h

  </chapter>

  </chapter>





  <chapter id="pubfunctions">

  <chapter id="pubfunctions">

Documentation/feature-removal-schedule.txt

+17 −0
Original line number Original line Diff line number Diff line
@@ -346,3 +346,20 @@ Why: See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and 
	Removal is subject to fixing any remaining bugs in ACPI which may

	Removal is subject to fixing any remaining bugs in ACPI which may

	cause the thermal throttling not to happen at the right time.

	cause the thermal throttling not to happen at the right time.

Who:	Dave Jones <davej@redhat.com>, Matthew Garrett <mjg@redhat.com>

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>

arch/alpha/kernel/irq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -90,7 +90,7 @@ show_interrupts(struct seq_file *p, void *v) 
		seq_printf(p, "%10u ", kstat_irqs(irq));

		seq_printf(p, "%10u ", kstat_irqs(irq));

#else

#else

		for_each_online_cpu(j)

		for_each_online_cpu(j)

			seq_printf(p, "%10u ", kstat_cpu(j).irqs[irq]);

			seq_printf(p, "%10u ", kstat_irqs_cpu(irq, j));

#endif

#endif

		seq_printf(p, " %14s", irq_desc[irq].chip->typename);

		seq_printf(p, " %14s", irq_desc[irq].chip->typename);

		seq_printf(p, "  %c%s",

		seq_printf(p, "  %c%s",

arch/alpha/kernel/irq_alpha.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ do_entInt(unsigned long type, unsigned long vector, 
		smp_percpu_timer_interrupt(regs);

		smp_percpu_timer_interrupt(regs);

		cpu = smp_processor_id();

		cpu = smp_processor_id();

		if (cpu != boot_cpuid) {

		if (cpu != boot_cpuid) {

		        kstat_cpu(cpu).irqs[RTC_IRQ]++;

		        kstat_incr_irqs_this_cpu(RTC_IRQ, irq_to_desc(RTC_IRQ));

		} else {

		} else {

			handle_irq(RTC_IRQ);

			handle_irq(RTC_IRQ);

		}

		}

arch/arm/kernel/irq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p, void *v) 




		seq_printf(p, "%3d: ", i);

		seq_printf(p, "%3d: ", i);

		for_each_present_cpu(cpu)

		for_each_present_cpu(cpu)

			seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]);

			seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu));

		seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-");

		seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-");

		seq_printf(p, "  %s", action->name);

		seq_printf(p, "  %s", action->name);

		for (action = action->next; action; action = action->next)

		for (action = action->next; action; action = action->next)

CRA Git | Maintained and supported by SUSTech CRA and CCSE