From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031481AbbDXPzh (ORCPT ); Fri, 24 Apr 2015 11:55:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44478 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031464AbbDXPzc (ORCPT ); Fri, 24 Apr 2015 11:55:32 -0400 Date: Fri, 24 Apr 2015 08:52:25 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: david.a.cohen@linux.intel.com, tony.luck@intel.com, bp@alien8.de, yinghai@kernel.org, sivanich@sgi.com, linux@eikelenboom.it, linux-kernel@vger.kernel.org, bhelgaas@google.com, hpa@zytor.com, david.vrabel@citrix.com, rdunlap@infradead.org, benh@kernel.crashing.org, jiang.liu@linux.intel.com, grant.likely@linaro.org, konrad.wilk@oracle.com, mingo@kernel.org, rjw@rjwysocki.net, andriy.shevchenko@linux.intel.com, joro@8bytes.org, JBeulich@suse.com, gregkh@linuxfoundation.org, tglx@linutronix.de Reply-To: david.a.cohen@linux.intel.com, tony.luck@intel.com, yinghai@kernel.org, bp@alien8.de, sivanich@sgi.com, linux-kernel@vger.kernel.org, bhelgaas@google.com, linux@eikelenboom.it, rdunlap@infradead.org, benh@kernel.crashing.org, david.vrabel@citrix.com, hpa@zytor.com, jiang.liu@linux.intel.com, mingo@kernel.org, rjw@rjwysocki.net, andriy.shevchenko@linux.intel.com, konrad.wilk@oracle.com, grant.likely@linaro.org, tglx@linutronix.de, JBeulich@suse.com, gregkh@linuxfoundation.org, joro@8bytes.org In-Reply-To: <1428905519-23704-32-git-send-email-jiang.liu@linux.intel.com> References: <1428905519-23704-32-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/irq: Remove unused pre_init_apic_IRQ0() Git-Commit-ID: 4e69d7eab4c24aa88fb0ec99fad7feac254d9ece 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: 4e69d7eab4c24aa88fb0ec99fad7feac254d9ece Gitweb: http://git.kernel.org/tip/4e69d7eab4c24aa88fb0ec99fad7feac254d9ece Author: Jiang Liu AuthorDate: Mon, 13 Apr 2015 14:11:53 +0800 Committer: Thomas Gleixner CommitDate: Fri, 24 Apr 2015 15:36:51 +0200 x86/irq: Remove unused pre_init_apic_IRQ0() Now there's no user of pre_init_apic_IRQ0(), so remove it. Signed-off-by: Jiang Liu Tested-by: Andy Shevchenko 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 Cc: Jan Beulich Cc: Grant Likely Link: http://lkml.kernel.org/r/1428905519-23704-32-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/io_apic.h | 1 - arch/x86/kernel/apic/io_apic.c | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h index 2f91685..c976de1 100644 --- a/arch/x86/include/asm/io_apic.h +++ b/arch/x86/include/asm/io_apic.h @@ -204,7 +204,6 @@ extern int mp_irqdomain_map(struct irq_domain *domain, unsigned int virq, irq_hw_number_t hwirq); extern void mp_irqdomain_unmap(struct irq_domain *domain, unsigned int virq); extern int mp_set_gsi_attr(u32 gsi, int trigger, int polarity, int node); -extern void __init pre_init_apic_IRQ0(void); extern void mp_save_irq(struct mpc_intsrc *m); diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 56d5321..540598c 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -3091,20 +3091,3 @@ int mp_set_gsi_attr(u32 gsi, int trigger, int polarity, int node) return ret; } - -/* Enable IOAPIC early just for system timer */ -void __init pre_init_apic_IRQ0(void) -{ - struct io_apic_irq_attr attr = { 0, 0, 0, 0 }; - - printk(KERN_INFO "Early APIC setup for system timer0\n"); -#ifndef CONFIG_SMP - physid_set_mask_of_physid(boot_cpu_physical_apicid, - &phys_cpu_present_map); -#endif - setup_local_APIC(); - - io_apic_setup_irq_pin(0, 0, &attr); - irq_set_chip_and_handler_name(0, &ioapic_chip, handle_edge_irq, - "edge"); -}