Skip to content

Commit

Permalink
[IA64] sn_hwperf semaphore to mutex
Browse files Browse the repository at this point in the history
Really simple mutex style semaphore user. The new API is struct mutex which is
what I've converted it to with this change.

Signed-off-by: Daniel Walker <dwalker@mvista.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
Daniel Walker authored and Tony Luck committed Feb 4, 2008
1 parent acffc84 commit 0245583
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions arch/ia64/sn/kernel/sn2/sn_hwperf.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <linux/smp_lock.h>
#include <linux/nodemask.h>
#include <linux/smp.h>
#include <linux/mutex.h>

#include <asm/processor.h>
#include <asm/topology.h>
Expand All @@ -50,7 +51,7 @@ static void *sn_hwperf_salheap = NULL;
static int sn_hwperf_obj_cnt = 0;
static nasid_t sn_hwperf_master_nasid = INVALID_NASID;
static int sn_hwperf_init(void);
static DECLARE_MUTEX(sn_hwperf_init_mutex);
static DEFINE_MUTEX(sn_hwperf_init_mutex);

#define cnode_possible(n) ((n) < num_cnodes)

Expand Down Expand Up @@ -884,10 +885,10 @@ static int sn_hwperf_init(void)
int e = 0;

/* single threaded, once-only initialization */
down(&sn_hwperf_init_mutex);
mutex_lock(&sn_hwperf_init_mutex);

if (sn_hwperf_salheap) {
up(&sn_hwperf_init_mutex);
mutex_unlock(&sn_hwperf_init_mutex);
return e;
}

Expand Down Expand Up @@ -936,7 +937,7 @@ static int sn_hwperf_init(void)
sn_hwperf_salheap = NULL;
sn_hwperf_obj_cnt = 0;
}
up(&sn_hwperf_init_mutex);
mutex_unlock(&sn_hwperf_init_mutex);
return e;
}

Expand Down

0 comments on commit 0245583

Please sign in to comment.