From 524b3fc918456c728e389f1f79c4ddea7a0d3a10 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Wed, 26 Sep 2012 12:44:51 +0200 Subject: [PATCH] --- yaml --- r: 350201 b: refs/heads/master c: a1bb20c232d066de0762f8e7cf332e5ce8385210 h: refs/heads/master i: 350199: 4bafed5c841e36c602896bb455723dc30765c77e v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/irq_remapping.h | 10 ---------- trunk/drivers/iommu/irq_remapping.c | 5 +++++ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 517979750598..7372c720df64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da165322dfb6cbc50042b1051f07b837a26f3bb8 +refs/heads/master: a1bb20c232d066de0762f8e7cf332e5ce8385210 diff --git a/trunk/arch/x86/include/asm/irq_remapping.h b/trunk/arch/x86/include/asm/irq_remapping.h index b30fca156644..95fd3527f632 100644 --- a/trunk/arch/x86/include/asm/irq_remapping.h +++ b/trunk/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/trunk/drivers/iommu/irq_remapping.c b/trunk/drivers/iommu/irq_remapping.c index 849ce4ce500b..d56f8c17c5fe 100644 --- a/trunk/drivers/iommu/irq_remapping.c +++ b/trunk/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) { /*