[PATCH 19/19] x86, irq: Move irq_remapped out of x86 core code

From: Joerg Roedel
Date: Tue Aug 07 2012 - 11:44:14 EST


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 <joerg.roedel@xxxxxxx>
---
arch/x86/include/asm/irq_remapping.h | 10 ----------
drivers/iommu/irq_remapping.c | 5 +++++
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 b670580..95fd352 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;
-}
-
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 d62e757..bf8be56 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;
+}
+
static void irq_remapping_disable_io_apic(void)
{
/*
--
1.7.9.5


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/