lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

genirq: Remove irq_2_iommu

Browse Source 
irq_2_iommu is now in the x86 code where it belongs. Remove all
leftovers.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Thomas Gleixner
2010-10-11 12:21:18 +02:00
parent 1a0730d664
commit 10ba1e0eee
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/linux/irq.h
View File

@@ -85,7 +85,6 @@ typedef void (*irq_flow_handler_t)(unsigned int irq,
#endif #endif
struct msi_desc; struct msi_desc;
struct irq_2_iommu;
/** /**
* struct irq_data - per irq and irq chip data passed down to chip functions * struct irq_data - per irq and irq chip data passed down to chip functions
@@ -97,7 +96,6 @@ struct irq_2_iommu;
* methods, to allow shared chip implementations * methods, to allow shared chip implementations
* @msi_desc: MSI descriptor * @msi_desc: MSI descriptor
* @affinity: IRQ affinity on SMP * @affinity: IRQ affinity on SMP
* @irq_2_iommu: iommu with this irq
* *
* The fields here need to overlay the ones in irq_desc until we * The fields here need to overlay the ones in irq_desc until we
* cleaned up the direct references and switched everything over to * cleaned up the direct references and switched everything over to
@@ -113,9 +111,6 @@ struct irq_data {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
cpumask_var_t affinity; cpumask_var_t affinity;
#endif #endif
#ifdef CONFIG_INTR_REMAP
struct irq_2_iommu *irq_2_iommu;
#endif
}; };
/** /**
@@ -389,19 +384,6 @@ static inline struct msi_desc *irq_data_get_msi(struct irq_data *d)
return d->msi_desc; return d->msi_desc;
} }
#ifdef CONFIG_INTR_REMAP
static inline struct irq_2_iommu *get_irq_iommu(unsigned int irq)
{
struct irq_data *d = irq_get_irq_data(irq);
return d ? d->irq_2_iommu : NULL;
}
static inline struct irq_2_iommu *irq_data_get_iommu(struct irq_data *d)
{
return d->irq_2_iommu;
}
#endif
int irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node); int irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node);
void irq_free_descs(unsigned int irq, unsigned int cnt); void irq_free_descs(unsigned int irq, unsigned int cnt);
int irq_reserve_irqs(unsigned int from, unsigned int cnt); int irq_reserve_irqs(unsigned int from, unsigned int cnt);

4
include/linux/irqdesc.h
View File

@@ -10,7 +10,6 @@
struct proc_dir_entry; struct proc_dir_entry;
struct timer_rand_state; struct timer_rand_state;
struct irq_2_iommu;
/** /**
* struct irq_desc - interrupt descriptor * struct irq_desc - interrupt descriptor
* @irq_data: per irq and chip data passed down to chip functions * @irq_data: per irq and chip data passed down to chip functions
@@ -52,9 +51,6 @@ struct irq_desc {
struct msi_desc *msi_desc; struct msi_desc *msi_desc;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
cpumask_var_t affinity; cpumask_var_t affinity;
#endif
#ifdef CONFIG_INTR_REMAP
struct irq_2_iommu *irq_2_iommu;
#endif #endif
}; };
}; };