From c103e022f4b536d0579019801257ee300002a7c5 Mon Sep 17 00:00:00 2001 From: Daniel Walker Date: Thu, 10 Jan 2008 20:31:51 -0800 Subject: [PATCH] --- yaml --- r: 83318 b: refs/heads/master c: 0245583ab454ba56131921e26ad966b56bcc0a5b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3fbbb489d031..b9da11a3dbc1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: acffc84ad9c1c8a79b8c1d6b9f4f530f37cba9ab +refs/heads/master: 0245583ab454ba56131921e26ad966b56bcc0a5b diff --git a/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c index ca882744d753..4b0d1538e7e5 100644 --- a/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -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) @@ -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; } @@ -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; }