Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e066489 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6 

Pull irqdomain bug fixes from Grant Likely:
 "This branch fixes a bug in irq_create_mapping() where an error return
  from irq_alloc_desc_from() gets ignored.

  It also removes irq_virq_count to fix a bug on powerpc where the
  irqdomain code does not find irqs allocated above the CONFIG_NR_IRQS
  boundary.

  The remaining patches get rid of an completely pointless export and
  fix some minor bugs in the irqdomain debug output."

* tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  irq_domain: Move irq_virq_count into NOMAP revmap
  irqdomain: Fix debugfs formatting
  irq_domain: correct the debugfs file name
  irq: Kill pointless irqd_to_hw export
  irq/irq_domain: Quit ignoring error returns from irq_alloc_desc_from().
parents 4abb663b 6fa6c8e2

arch/c6x/include/asm/irq.h

+0 −4
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ 
/* This number is used when no interrupt has been assigned */

#define NO_IRQ		0



struct irq_data;

extern irq_hw_number_t irqd_to_hwirq(struct irq_data *d);

extern irq_hw_number_t virq_to_hw(unsigned int virq);



extern void __init init_pic_c64xplus(void);



extern void init_IRQ(void);

arch/c6x/kernel/irq.c

+0 −13
Original line number Diff line number Diff line
@@ -130,16 +130,3 @@ int arch_show_interrupts(struct seq_file *p, int prec) 
	seq_printf(p, "%*s: %10lu\n", prec, "Err", irq_err_count);

	return 0;

}
 


irq_hw_number_t irqd_to_hwirq(struct irq_data *d)

{

	return d->hwirq;

}

EXPORT_SYMBOL_GPL(irqd_to_hwirq);



irq_hw_number_t virq_to_hw(unsigned int virq)

{

	struct irq_data *irq_data = irq_get_irq_data(virq);

	return WARN_ON(!irq_data) ? 0 : irq_data->hwirq;

}

EXPORT_SYMBOL_GPL(virq_to_hw);

arch/powerpc/include/asm/irq.h

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ extern atomic_t ppc_n_lost_interrupts; 
/* Same thing, used by the generic IRQ code */

#define NR_IRQS_LEGACY		NUM_ISA_INTERRUPTS



struct irq_data;

extern irq_hw_number_t irqd_to_hwirq(struct irq_data *d);

extern irq_hw_number_t virq_to_hw(unsigned int virq);



/**

arch/powerpc/kernel/irq.c

+0 −6
Original line number Diff line number Diff line
@@ -560,12 +560,6 @@ void do_softirq(void) 
	local_irq_restore(flags);

}



irq_hw_number_t irqd_to_hwirq(struct irq_data *d)

{

	return d->hwirq;

}

EXPORT_SYMBOL_GPL(irqd_to_hwirq);



irq_hw_number_t virq_to_hw(unsigned int virq)

{

	struct irq_data *irq_data = irq_get_irq_data(virq);

arch/powerpc/platforms/cell/axon_msi.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static int axon_msi_probe(struct platform_device *device) 
	}

	memset(msic->fifo_virt, 0xff, MSIC_FIFO_SIZE_BYTES);



	msic->irq_domain = irq_domain_add_nomap(dn, &msic_host_ops, msic);

	msic->irq_domain = irq_domain_add_nomap(dn, 0, &msic_host_ops, msic);

	if (!msic->irq_domain) {

		printk(KERN_ERR "axon_msi: couldn't allocate irq_domain for %s\n",

		       dn->full_name);