From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031579AbbDXP5Y (ORCPT ); Fri, 24 Apr 2015 11:57:24 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44622 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031563AbbDXP5T (ORCPT ); Fri, 24 Apr 2015 11:57:19 -0400 Date: Fri, 24 Apr 2015 08:56:19 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: linux@eikelenboom.it, gregkh@linuxfoundation.org, benh@kernel.crashing.org, rdunlap@infradead.org, hpa@zytor.com, konrad.wilk@oracle.com, tony.luck@intel.com, sivanich@sgi.com, bp@alien8.de, david.vrabel@citrix.com, david.a.cohen@linux.intel.com, tglx@linutronix.de, joro@8bytes.org, mingo@kernel.org, jiang.liu@linux.intel.com, bhelgaas@google.com, rjw@rjwysocki.net, yinghai@kernel.org, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, rdunlap@infradead.org, konrad.wilk@oracle.com, linux@eikelenboom.it, gregkh@linuxfoundation.org, benh@kernel.crashing.org, tony.luck@intel.com, sivanich@sgi.com, bp@alien8.de, david.vrabel@citrix.com, david.a.cohen@linux.intel.com, joro@8bytes.org, tglx@linutronix.de, jiang.liu@linux.intel.com, mingo@kernel.org, rjw@rjwysocki.net, bhelgaas@google.com, linux-kernel@vger.kernel.org, yinghai@kernel.org In-Reply-To: <1428978610-28986-8-git-send-email-jiang.liu@linux.intel.com> References: <1428978610-28986-8-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/irq: Remove GENERIC_IRQ_LEGACY_ALLOC_HWIRQ Git-Commit-ID: baac16952635445addaf397bad74e847db821d6d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: baac16952635445addaf397bad74e847db821d6d Gitweb: http://git.kernel.org/tip/baac16952635445addaf397bad74e847db821d6d Author: Jiang Liu AuthorDate: Tue, 14 Apr 2015 10:29:44 +0800 Committer: Thomas Gleixner CommitDate: Fri, 24 Apr 2015 15:36:52 +0200 x86/irq: Remove GENERIC_IRQ_LEGACY_ALLOC_HWIRQ There's no user of irq_alloc_hwirqs(), irq_alloc_hwirq(), irq_free_hwirqs() and irq_free_hwirq() in x86 anymore, so remove GENERIC_IRQ_LEGACY_ALLOC_HWIRQ and related code. Signed-off-by: Jiang Liu Cc: Konrad Rzeszutek Wilk Cc: David Cohen Cc: Sander Eikelenboom Cc: David Vrabel Cc: Tony Luck Cc: Joerg Roedel Cc: Greg Kroah-Hartman Cc: Bjorn Helgaas Cc: Benjamin Herrenschmidt Cc: Rafael J. Wysocki Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Cc: Dimitri Sivanich Link: http://lkml.kernel.org/r/1428978610-28986-8-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/Kconfig | 1 - arch/x86/kernel/apic/vector.c | 34 ---------------------------------- 2 files changed, 35 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 26e0665..c86fdc1 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -912,7 +912,6 @@ config X86_UP_IOAPIC config X86_LOCAL_APIC def_bool y depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC || PCI_MSI - select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ select IRQ_DOMAIN_HIERARCHY select PCI_MSI_IRQ_DOMAIN if PCI_MSI diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c index 633f032..d0e5ea0 100644 --- a/arch/x86/kernel/apic/vector.c +++ b/arch/x86/kernel/apic/vector.c @@ -659,40 +659,6 @@ void irq_force_complete_move(int irq) } #endif -/* - * Dynamic irq allocate and deallocation. Should be replaced by irq domains! - */ -int arch_setup_hwirq(unsigned int irq, int node) -{ - struct irq_cfg *cfg; - unsigned long flags; - int ret; - - cfg = alloc_irq_cfg(node); - if (!cfg) - return -ENOMEM; - - raw_spin_lock_irqsave(&vector_lock, flags); - ret = __assign_irq_vector(irq, cfg, apic->target_cpus()); - raw_spin_unlock_irqrestore(&vector_lock, flags); - - if (!ret) - irq_set_chip_data(irq, cfg); - else - free_irq_cfg(cfg); - return ret; -} - -void arch_teardown_hwirq(unsigned int irq) -{ - struct irq_cfg *cfg = irq_cfg(irq); - - free_remapped_irq(irq); - clear_irq_vector(irq, cfg); - irq_set_chip_data(irq, NULL); - free_irq_cfg(cfg); -} - static void __init print_APIC_field(int base) { int i;