From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Thu, 4 Sep 2008 18:37:50 +0000 (+0400)
Subject: x86: io-apic - declare irq_cfg_lock for SPARSE_IRQ only
X-Git-Tag: v2.6.28-rc1~80^2~59
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ac54a6c9371bacb86bee1db23f7d82e8685c7e17;p=linux-2.6-omap-h63xx.git

x86: io-apic - declare irq_cfg_lock for SPARSE_IRQ only

We use irq_cfg_lock lock in SPARSE_IRQ only context so
move it under #ifdef and compiler will be happy.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index 9b01fdadcb9..d22fecf828b 100644
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -147,14 +147,15 @@ static void init_one_irq_cfg(struct irq_cfg *cfg)
 
 static struct irq_cfg *irq_cfgx;
 
+#ifdef CONFIG_HAVE_SPARSE_IRQ
 /*
  * Protect the irq_cfgx_free freelist:
  */
 static DEFINE_SPINLOCK(irq_cfg_lock);
 
-#ifdef CONFIG_HAVE_SPARSE_IRQ
 static struct irq_cfg *irq_cfgx_free;
 #endif
+
 static void __init init_work(void *data)
 {
 	struct dyn_array *da = data;