diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /arch/sh/kernel/semaphore.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'arch/sh/kernel/semaphore.c')
| -rw-r--r-- | arch/sh/kernel/semaphore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/semaphore.c b/arch/sh/kernel/semaphore.c index a3c24dcbf01d..184119eeae56 100644 --- a/arch/sh/kernel/semaphore.c +++ b/arch/sh/kernel/semaphore.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <asm/semaphore.h> | 14 | #include <asm/semaphore.h> |
| 15 | #include <asm/semaphore-helper.h> | 15 | #include <asm/semaphore-helper.h> |
| 16 | 16 | ||
| 17 | spinlock_t semaphore_wake_lock; | 17 | DEFINE_SPINLOCK(semaphore_wake_lock); |
| 18 | 18 | ||
| 19 | /* | 19 | /* |
| 20 | * Semaphores are implemented using a two-way counter: | 20 | * Semaphores are implemented using a two-way counter: |