1 From 90d564a00cca544b9eb4e6eff3790d5f0f8676b0 Mon Sep 17 00:00:00 2001
2 From: Nick Bowler <nbowler@draconx.ca>
3 Date: Wed, 17 Nov 2010 21:24:42 -0500
4 Subject: [PATCH] Convert DECLARE_MUTEX to DEFINE_SEMAPHORE.
9 2 files changed, 2 insertions(+), 2 deletions(-)
11 diff --git a/thinkpad_ec.c b/thinkpad_ec.c
12 index 2d77a64..e026a72 100644
15 @@ -88,7 +88,7 @@ static u64 prefetch_jiffies; /* time of prefetch, or: */
16 #define TPC_PREFETCH_JUNK (INITIAL_JIFFIES+1) /* Ignore prefetch */
19 -static DECLARE_MUTEX(thinkpad_ec_mutex);
20 +static DEFINE_SEMAPHORE(thinkpad_ec_mutex);
22 /* Kludge in case the ACPI DSDT reserves the ports we need. */
23 static int force_io; /* Willing to do IO to ports we couldn't reserve? */
24 diff --git a/tp_smapi.c b/tp_smapi.c
25 index 0cdbd0e..f6c833f 100644
28 @@ -109,7 +109,7 @@ static struct { u8 rc; char *msg; int ret; } smapi_retcode[] =
29 #define SMAPI_PORT2 0x4F /* fixed port, meaning unclear */
30 static unsigned short smapi_port; /* APM control port, normally 0xB2 */
32 -static DECLARE_MUTEX(smapi_mutex);
33 +static DEFINE_SEMAPHORE(smapi_mutex);
36 * find_smapi_port - read SMAPI port from NVRAM