aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Roedel <joro@8bytes.org>2012-09-26 06:44:51 -0400
committerJoerg Roedel <joro@8bytes.org>2013-01-28 06:51:52 -0500
commita1bb20c232d066de0762f8e7cf332e5ce8385210 (patch)
tree681f155e2c27670834840599d50409dc4e1045dd
parentda165322dfb6cbc50042b1051f07b837a26f3bb8 (diff)
x86, irq: Move irq_remapped out of x86 core code
The irq_remapped function is only used in IOMMU code after the last patch. So move its definition there too. Signed-off-by: Joerg Roedel <joro@8bytes.org> Acked-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--arch/x86/include/asm/irq_remapping.h10
-rw-r--r--drivers/iommu/irq_remapping.c5
2 files changed, 5 insertions, 10 deletions
diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
index b30fca156644..95fd3527f632 100644
--- a/arch/x86/include/asm/irq_remapping.h
+++ b/arch/x86/include/asm/irq_remapping.h
@@ -48,11 +48,6 @@ extern bool setup_remapped_irq(int irq,
48 struct irq_cfg *cfg, 48 struct irq_cfg *cfg,
49 struct irq_chip *chip); 49 struct irq_chip *chip);
50 50
51static inline bool irq_remapped(struct irq_cfg *cfg)
52{
53 return (cfg->remapped == 1);
54}
55
56void irq_remap_modify_chip_defaults(struct irq_chip *chip); 51void irq_remap_modify_chip_defaults(struct irq_chip *chip);
57 52
58#else /* CONFIG_IRQ_REMAP */ 53#else /* CONFIG_IRQ_REMAP */
@@ -87,11 +82,6 @@ static inline void panic_if_irq_remap(const char *msg)
87{ 82{
88} 83}
89 84
90static inline bool irq_remapped(struct irq_cfg *cfg)
91{
92 return false;
93}
94
95static inline void irq_remap_modify_chip_defaults(struct irq_chip *chip) 85static inline void irq_remap_modify_chip_defaults(struct irq_chip *chip)
96{ 86{
97} 87}
diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
index 849ce4ce500b..d56f8c17c5fe 100644
--- a/drivers/iommu/irq_remapping.c
+++ b/drivers/iommu/irq_remapping.c
@@ -31,6 +31,11 @@ static int set_remapped_irq_affinity(struct irq_data *data,
31 const struct cpumask *mask, 31 const struct cpumask *mask,
32 bool force); 32 bool force);
33 33
34static bool irq_remapped(struct irq_cfg *cfg)
35{
36 return (cfg->remapped == 1);
37}
38
34static void irq_remapping_disable_io_apic(void) 39static void irq_remapping_disable_io_apic(void)
35{ 40{
36 /* 41 /*