From bc0917cff45153779955132c4d0e7d5186fd40da Mon Sep 17 00:00:00 2001
From: Cliff Wickman <cpw@sgi.com>
Date: Wed, 18 Jan 2012 09:40:47 -0600
Subject: [PATCH] --- yaml --- r: 286806 b: refs/heads/master c:
 d2ebc71d472020bc30e29afe8c4d2a85a5b41f56 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/platform/uv/tlb_uv.c | 2 ++
 trunk/arch/x86/platform/uv/uv_irq.c | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 495f16ff08e0..2a101218d9d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a51467b146ab7948d2f6812892eac120a30529c
+refs/heads/master: d2ebc71d472020bc30e29afe8c4d2a85a5b41f56
diff --git a/trunk/arch/x86/platform/uv/tlb_uv.c b/trunk/arch/x86/platform/uv/tlb_uv.c
index 9be4cff00a2d..3ae0e61abd23 100644
--- a/trunk/arch/x86/platform/uv/tlb_uv.c
+++ b/trunk/arch/x86/platform/uv/tlb_uv.c
@@ -1851,6 +1851,8 @@ static void __init init_per_cpu_tunables(void)
 		bcp->cong_reps			= congested_reps;
 		bcp->cong_period		= congested_period;
 		bcp->clocks_per_100_usec =	usec_2_cycles(100);
+		spin_lock_init(&bcp->queue_lock);
+		spin_lock_init(&bcp->uvhub_lock);
 	}
 }
 
diff --git a/trunk/arch/x86/platform/uv/uv_irq.c b/trunk/arch/x86/platform/uv/uv_irq.c
index 374a05d8ad22..f25c2765a5c9 100644
--- a/trunk/arch/x86/platform/uv/uv_irq.c
+++ b/trunk/arch/x86/platform/uv/uv_irq.c
@@ -25,7 +25,7 @@ struct uv_irq_2_mmr_pnode{
 	int			irq;
 };
 
-static spinlock_t		uv_irq_lock;
+static DEFINE_SPINLOCK(uv_irq_lock);
 static struct rb_root		uv_irq_root;
 
 static int uv_set_irq_affinity(struct irq_data *, const struct cpumask *, bool);