From a091c716f08c2e83dfca939094bd3717b9fb21a0 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Tue, 19 Aug 2008 20:50:49 -0700
Subject: [PATCH] --- yaml --- r: 116454 b: refs/heads/master c:
 29ccbbf232c035b8c7ff0c5060fbe30a66ed9b99 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/io_apic.c | 7 -------
 trunk/arch/x86/kernel/setup.c   | 4 ----
 trunk/include/asm-x86/irq.h     | 3 ---
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 09cdbe2bbf06..f9bafed25839 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eb2cce84beae8fd41de950569cafd5bca7edd5d
+refs/heads/master: 29ccbbf232c035b8c7ff0c5060fbe30a66ed9b99
diff --git a/trunk/arch/x86/kernel/io_apic.c b/trunk/arch/x86/kernel/io_apic.c
index a466b04ad5a4..5de2d38812aa 100644
--- a/trunk/arch/x86/kernel/io_apic.c
+++ b/trunk/arch/x86/kernel/io_apic.c
@@ -72,13 +72,6 @@ int sis_apic_bug = -1;
 static DEFINE_SPINLOCK(ioapic_lock);
 static DEFINE_SPINLOCK(vector_lock);
 
-int first_free_entry;
-/*
- * Rough estimation of how many shared IRQs there are, can
- * be changed anytime.
- */
-int pin_map_size;
-
 /*
  * # of IRQ routing registers
  */
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index 02e3a6697977..d90c659b70e9 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/arch/x86/kernel/setup.c
@@ -1074,10 +1074,6 @@ void __init setup_arch(char **cmdline_p)
 		nr_irqs = 32 * nr_cpu_ids + 224;
 	init_cpu_to_node();
 #endif
-#ifdef CONFIG_X86_IO_APIC
-	pin_map_size = nr_irqs * 2;
-	first_free_entry = nr_irqs;
-#endif
 
 	init_apic_mappings();
 	ioapic_init_mappings();
diff --git a/trunk/include/asm-x86/irq.h b/trunk/include/asm-x86/irq.h
index 2a130c44f5de..1e5f2909c1db 100644
--- a/trunk/include/asm-x86/irq.h
+++ b/trunk/include/asm-x86/irq.h
@@ -10,9 +10,6 @@
 #include <asm/apicdef.h>
 #include <asm/irq_vectors.h>
 
-extern int pin_map_size;
-extern int first_free_entry;
-
 static inline int irq_canonicalize(int irq)
 {
 	return ((irq == 2) ? 9 : irq);