aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Roedel <joro@8bytes.org>2012-09-26 12:44:51 +0200
committerJoerg Roedel <joro@8bytes.org>2013-01-28 12:51:52 +0100
commita1bb20c232d066de0762f8e7cf332e5ce8385210 (patch)
tree681f155e2c27670834840599d50409dc4e1045dd
parentda165322dfb6cbc50042b1051f07b837a26f3bb8 (diff)
x86, irq: Move irq_remapped out of x86 core codeioapic-cleanups-for-tip
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,
struct irq_cfg *cfg,
struct irq_chip *chip);
-static inline bool irq_remapped(struct irq_cfg *cfg)
-{
- return (cfg->remapped == 1);
-}
-
void irq_remap_modify_chip_defaults(struct irq_chip *chip);
#else /* CONFIG_IRQ_REMAP */
@@ -87,11 +82,6 @@ static inline void panic_if_irq_remap(const char *msg)
{
}
-static inline bool irq_remapped(struct irq_cfg *cfg)
-{
- return false;
-}
-
static inline void irq_remap_modify_chip_defaults(struct irq_chip *chip)
{
}
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,
const struct cpumask *mask,
bool force);
+static bool irq_remapped(struct irq_cfg *cfg)
+{
+ return (cfg->remapped == 1);
+}
+
static void irq_remapping_disable_io_apic(void)
{
/*