Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752847AbaKCLKd (ORCPT ); Mon, 3 Nov 2014 06:10:33 -0500 Received: from terminus.zytor.com ([198.137.202.10]:48379 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751478AbaKCLK2 (ORCPT ); Mon, 3 Nov 2014 06:10:28 -0500 Date: Mon, 3 Nov 2014 02:58:55 -0800 From: tip-bot for Yinghai Lu Message-ID: Cc: rdunlap@infradead.org, sebastian@breakpoint.cc, benh@kernel.crashing.org, konrad.wilk@oracle.com, jiang.liu@linux.intel.com, mingo@kernel.org, bhelgaas@google.com, hpa@zytor.com, prarit@redhat.com, linux-kernel@vger.kernel.org, bp@alien8.de, rjw@rjwysocki.net, yinghai@kernel.org, joro@8bytes.org, tony.luck@intel.com, gregkh@linuxfoundation.org, tglx@linutronix.de, grant.likely@linaro.org Reply-To: tglx@linutronix.de, grant.likely@linaro.org, yinghai@kernel.org, joro@8bytes.org, rjw@rjwysocki.net, gregkh@linuxfoundation.org, tony.luck@intel.com, hpa@zytor.com, prarit@redhat.com, linux-kernel@vger.kernel.org, bp@alien8.de, rdunlap@infradead.org, sebastian@breakpoint.cc, konrad.wilk@oracle.com, jiang.liu@linux.intel.com, benh@kernel.crashing.org, bhelgaas@google.com, mingo@kernel.org In-Reply-To: <1414387308-27148-10-git-send-email-jiang.liu@linux.intel.com> References: <1414387308-27148-10-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86, irq: Split out alloc_ioapic_save_registers() Git-Commit-ID: 8cda974ab278dd8d4a9024085535f71175ddf38d 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: 8cda974ab278dd8d4a9024085535f71175ddf38d Gitweb: http://git.kernel.org/tip/8cda974ab278dd8d4a9024085535f71175ddf38d Author: Yinghai Lu AuthorDate: Mon, 27 Oct 2014 13:21:39 +0800 Committer: Thomas Gleixner CommitDate: Mon, 3 Nov 2014 11:56:07 +0100 x86, irq: Split out alloc_ioapic_save_registers() Split out alloc_ioapic_save_registers() from early_irq_init(), so it could be used for ioapic hotplug later. Signed-off-by: Yinghai Lu Signed-off-by: Jiang Liu Cc: Konrad Rzeszutek Wilk Cc: Tony Luck Cc: Joerg Roedel Cc: Greg Kroah-Hartman Cc: Sebastian Andrzej Siewior Cc: Benjamin Herrenschmidt Cc: Rafael J. Wysocki Cc: Bjorn Helgaas Cc: Randy Dunlap Cc: Borislav Petkov Cc: Grant Likely Cc: Prarit Bhargava Link: http://lkml.kernel.org/r/1414387308-27148-10-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/io_apic.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 1183d54..acaee90 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -237,6 +237,19 @@ static struct irq_pin_list *alloc_irq_pin_list(int node) return kzalloc_node(sizeof(struct irq_pin_list), GFP_KERNEL, node); } +static void alloc_ioapic_saved_registers(int idx) +{ + size_t size; + + if (ioapics[idx].saved_registers) + return; + + size = sizeof(struct IO_APIC_route_entry) * ioapics[idx].nr_registers; + ioapics[idx].saved_registers = kzalloc(size, GFP_KERNEL); + if (!ioapics[idx].saved_registers) + pr_err("IOAPIC %d: suspend/resume impossible!\n", idx); +} + int __init arch_early_irq_init(void) { struct irq_cfg *cfg; @@ -245,13 +258,8 @@ int __init arch_early_irq_init(void) if (!nr_legacy_irqs()) io_apic_irqs = ~0UL; - for_each_ioapic(i) { - ioapics[i].saved_registers = - kzalloc(sizeof(struct IO_APIC_route_entry) * - ioapics[i].nr_registers, GFP_KERNEL); - if (!ioapics[i].saved_registers) - pr_err("IOAPIC %d: suspend/resume impossible!\n", i); - } + for_each_ioapic(i) + alloc_ioapic_saved_registers(i); /* * For legacy IRQ's, start with assigning irq0 to irq15 to -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/