From 3c78f63d286ace81b76129d4cc9b14c60b756f22 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Wed, 10 Feb 2010 01:20:36 -0800
Subject: [PATCH] --- yaml --- r: 185162 b: refs/heads/master c:
 6738762d73a237ec322b04d8b9d55c8fd5d84713 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/arch/x86/kernel/apic/io_apic.c | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 5382e075e4ec..bb5c20bfac31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5eb78f76ddfa7caf4340cf6893b032f45d8114a
+refs/heads/master: 6738762d73a237ec322b04d8b9d55c8fd5d84713
diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c
index f5e40339622b..c64ddd9d9979 100644
--- a/trunk/arch/x86/kernel/apic/io_apic.c
+++ b/trunk/arch/x86/kernel/apic/io_apic.c
@@ -3826,28 +3826,6 @@ void __init probe_nr_irqs_gsi(void)
 	printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi);
 }
 
-#ifdef CONFIG_SPARSE_IRQ
-int __init arch_probe_nr_irqs(void)
-{
-	int nr;
-
-	if (nr_irqs > (NR_VECTORS * nr_cpu_ids))
-		nr_irqs = NR_VECTORS * nr_cpu_ids;
-
-	nr = nr_irqs_gsi + 8 * nr_cpu_ids;
-#if defined(CONFIG_PCI_MSI) || defined(CONFIG_HT_IRQ)
-	/*
-	 * for MSI and HT dyn irq
-	 */
-	nr += nr_irqs_gsi * 16;
-#endif
-	if (nr < nr_irqs)
-		nr_irqs = nr;
-
-	return 0;
-}
-#endif
-
 static int __io_apic_set_pci_routing(struct device *dev, int irq,
 				struct io_apic_irq_attr *irq_attr)
 {