diff options
author | Jiang Liu <jiang.liu@linux.intel.com> | 2015-01-07 02:31:40 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-01-15 05:24:23 -0500 |
commit | c392f56c946033bd136043079a62b9188888828d (patch) | |
tree | f2917dafcc643ce4d107f9bc355163ed64cfba41 /arch/x86/kernel/apic | |
parent | 84d0779304b5c45134311dfc31b5a2325ce3ad84 (diff) |
iommu/irq_remapping: Kill function irq_remapping_supported() and related code
Simplify irq_remapping code by killing irq_remapping_supported() and
related interfaces.
Joerg posted a similar patch at https://lkml.org/lkml/2014/12/15/490,
so assume an signed-off from Joerg.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Tested-by: Joerg Roedel <joro@8bytes.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: iommu@lists.linux-foundation.org
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: David Rientjes <rientjes@google.com>
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Cc: Jan Beulich <JBeulich@suse.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Oren Twaig <oren@scalemp.com>
Link: http://lkml.kernel.org/r/1420615903-28253-14-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/apic')
-rw-r--r-- | arch/x86/kernel/apic/apic.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 2f16116ced90..35e6d09294ed 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
@@ -1575,12 +1575,7 @@ void enable_x2apic(void) | |||
1575 | 1575 | ||
1576 | static int __init try_to_enable_IR(void) | 1576 | static int __init try_to_enable_IR(void) |
1577 | { | 1577 | { |
1578 | #ifdef CONFIG_IRQ_REMAP | 1578 | #ifdef CONFIG_X86_IO_APIC |
1579 | if (!irq_remapping_supported()) { | ||
1580 | pr_debug("intr-remapping not supported\n"); | ||
1581 | return -1; | ||
1582 | } | ||
1583 | |||
1584 | if (!x2apic_enabled() && skip_ioapic_setup) { | 1579 | if (!x2apic_enabled() && skip_ioapic_setup) { |
1585 | pr_info("Skipped enabling intr-remap because of skipping " | 1580 | pr_info("Skipped enabling intr-remap because of skipping " |
1586 | "io-apic setup\n"); | 1581 | "io-apic setup\n"); |