From d653080ab91fbf6d709672186ab539949c9e6274 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 27 Sep 2006 11:31:32 +0900
Subject: [PATCH] --- yaml --- r: 36223 b: refs/heads/master c:
 765ae317ce030217af556dc46bec238dab15091e h: refs/heads/master i:   36221:
 6db35c40e98df4acec7b22bc97fdcd11a03ddb42   36219:
 dab69f4235384b2a122309f03e309ac5e875a1c7   36215:
 50b8e899e87a7a182dd84a485f21c2d785b1a12d   36207:
 4bd090869a69c86ba320a9b4dc767a211c06cfcd   36191:
 916781ad7b63e960ca7f294da3a2b0c3ef9105db   36159:
 4864c295097bf88bf8b5ed061767111781c7c300   36095:
 f12adeebc6aad58f98de2e5a45668d82e536b80e v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sh/kernel/semaphore.c | 2 +-
 trunk/arch/sh/kernel/traps.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2ec6af3864e3..448cc3162fe4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a252710fc5b63b24934905ca47ecf661702d7f00
+refs/heads/master: 765ae317ce030217af556dc46bec238dab15091e
diff --git a/trunk/arch/sh/kernel/semaphore.c b/trunk/arch/sh/kernel/semaphore.c
index a3c24dcbf01d..184119eeae56 100644
--- a/trunk/arch/sh/kernel/semaphore.c
+++ b/trunk/arch/sh/kernel/semaphore.c
@@ -14,7 +14,7 @@
 #include <asm/semaphore.h>
 #include <asm/semaphore-helper.h>
 
-spinlock_t semaphore_wake_lock;
+DEFINE_SPINLOCK(semaphore_wake_lock);
 
 /*
  * Semaphores are implemented using a two-way counter:
diff --git a/trunk/arch/sh/kernel/traps.c b/trunk/arch/sh/kernel/traps.c
index d9db1180f770..21bef1b5f991 100644
--- a/trunk/arch/sh/kernel/traps.c
+++ b/trunk/arch/sh/kernel/traps.c
@@ -86,7 +86,7 @@ asmlinkage void do_##name(unsigned long r4, unsigned long r5,		\
 #define VMALLOC_OFFSET (8*1024*1024)
 #define MODULE_RANGE (8*1024*1024)
 
-spinlock_t die_lock;
+DEFINE_SPINLOCK(die_lock);
 
 void die(const char * str, struct pt_regs * regs, long err)
 {