Skip to contentSkip to conversation

use mutex instead of semaphore in EDAC core

PATCH In review Matthias Kaehlcke 2 participants 2 messages Apr 25, 2007 EDAC-core

lore
Share & tools
lore

Matthias Kaehlcke

author
#0 lore raw

PATCH 1/1 use mutex instead of semaphore in EDAC core

the EDAC core code uses a semaphore as mutex. use the mutex API instead of the (binary) semaphore

Signed-off-by Matthias Kaehlcke <[email protected]>

--

drivers/edac/edac_mc.c +9 -9
index 7b62230..f217750 100644
@@ -50,7 +50,7 @@ static int panic_on_ue;
 static int poll_msec = 1000;
 
 /* lock to memory controller's control array */
-static DECLARE_MUTEX(mem_ctls_mutex);
+static DEFINE_MUTEX(mem_ctls_mutex);
 static struct list_head mc_devices = LIST_HEAD_INIT(mc_devices);
 
 static struct task_struct *edac_thread;

@@ -1489,7 +1489,7 @@ int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)
 		}
 	}
 #endif
-	down(&mem_ctls_mutex);
+	mutex_lock(&mem_ctls_mutex);
 
 	if (add_mc_to_global_list(mci))
 		goto fail0;

@@ -1507,14 +1507,14 @@ int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)
 	edac_mc_printk(mci, KERN_INFO, "Giving out device to %s %s: DEV %s\n",
 		mci->mod_name, mci->ctl_name, dev_name(mci->dev));
 
-	up(&mem_ctls_mutex);
+	mutex_unlock(&mem_ctls_mutex);
 	return 0;
 
 fail1:
 	del_mc_from_global_list(mci);
 
 fail0:
-	up(&mem_ctls_mutex);
+	mutex_unlock(&mem_ctls_mutex);
 	return 1;
 }
 EXPORT_SYMBOL_GPL(edac_mc_add_mc);

@@ -1531,16 +1531,16 @@ struct mem_ctl_info * edac_mc_del_mc(struct device *dev)
 	struct mem_ctl_info *mci;
 
 	debugf0("MC: %s()\n", __func__);
-	down(&mem_ctls_mutex);
+	mutex_lock(&mem_ctls_mutex);
 
 	if ((mci = find_mci_by_dev(dev)) == NULL) {
-		up(&mem_ctls_mutex);
+		mutex_unlock(&mem_ctls_mutex);
 		return NULL;
 	}
 
 	edac_remove_sysfs_mci_device(mci);
 	del_mc_from_global_list(mci);
-	up(&mem_ctls_mutex);
+	mutex_unlock(&mem_ctls_mutex);
 	edac_printk(KERN_INFO, EDAC_MC,
 		"Removed device %d for %s %s: DEV %s\n", mci->mc_idx,
 		mci->mod_name, mci->ctl_name, dev_name(mci->dev));

@@ -1877,7 +1877,7 @@ static inline void check_mc_devices(void)
 	struct mem_ctl_info *mci;
 
 	debugf3("%s()\n", __func__);
-	down(&mem_ctls_mutex);
+	mutex_lock(&mem_ctls_mutex);
 
 	list_for_each(item, &mc_devices) {
 		mci = list_entry(item, struct mem_ctl_info, link);

@@ -1886,7 +1886,7 @@ static inline void check_mc_devices(void)
 			mci->edac_check(mci);
 	}
 
-	up(&mem_ctls_mutex);
+	mutex_unlock(&mem_ctls_mutex);
 }
 
 /*
Signature · 12 lines
Matthias Kaehlcke
Linux Application Developer
Barcelona

                Don't walk behind me, I may not lead
             Don't walk in front of me, I may not follow
                Just walk beside me and be my friend
                          (Albert Camus)
                                                                 .''`.
    using free software / Debian GNU/Linux | http://debian.org  : :'  :
                                                                `. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4                  `-
#1 lore raw

Thanks, I will have to modify this, as the edac_mc.c has been re-written in a patch I have in my queue, but not net pushed up stream. I will generate a new quilt patch with your named acknowledged.

thanks

doug thompson

Quoted 105 lines · --- Matthias Kaehlcke

the EDAC core code uses a semaphore as mutex. use the mutex API instead of the (binary) semaphore

Signed-off-by Matthias Kaehlcke <[email protected]>

--

drivers/edac/edac_mc.c +2 -2
index 7b62230..f217750 100644
@@ -50,7 +50,7 @@ static int panic_on_ue;
 static int poll_msec = 1000;
 
 /* lock to memory controller's control array */
-static DECLARE_MUTEX(mem_ctls_mutex);
+static DEFINE_MUTEX(mem_ctls_mutex);
 static struct list_head mc_devices = LIST_HEAD_INIT(mc_devices);
 
 static struct task_struct *edac_thread;

@@ -1489,7 +1489,7 @@ int edac_mc_add_mc(struct mem_ctl_info *mci,
 int mc_idx)
 		}
 	}
 #endif
-	down(&mem_ctls_mutex);
+	mutex_lock(&mem_ctls_mutex);
 
 	if (add_mc_to_global_list(mci))
drivers/edac/edac_mc.c +2 -2
 		goto fail0;

@@ -1507,14 +1507,14 @@ int edac_mc_add_mc(struct mem_ctl_info *mci,
 int mc_idx)
 	edac_mc_printk(mci, KERN_INFO, "Giving out device to %s %s: DEV
 %s\n",
 		mci->mod_name, mci->ctl_name, dev_name(mci->dev));
 
-	up(&mem_ctls_mutex);
+	mutex_unlock(&mem_ctls_mutex);
 	return 0;
 
 fail1:
 	del_mc_from_global_list(mci);
 
 fail0:
-	up(&mem_ctls_mutex);
+	mutex_unlock(&mem_ctls_mutex);
 	return 1;

}
EXPORT_SYMBOL_GPL(edac_mc_add_mc);

drivers/edac/edac_mc.c +3 -3
@@ -1531,16 +1531,16 @@ struct mem_ctl_info * edac_mc_del_mc(struct
 device *dev)
 	struct mem_ctl_info *mci;
 
 	debugf0("MC: %s()\n", __func__);
-	down(&mem_ctls_mutex);
+	mutex_lock(&mem_ctls_mutex);
 
 	if ((mci = find_mci_by_dev(dev)) == NULL) {
-		up(&mem_ctls_mutex);
+		mutex_unlock(&mem_ctls_mutex);
 		return NULL;
 	}
 
 	edac_remove_sysfs_mci_device(mci);
 	del_mc_from_global_list(mci);
-	up(&mem_ctls_mutex);
+	mutex_unlock(&mem_ctls_mutex);
 	edac_printk(KERN_INFO, EDAC_MC,
 		"Removed device %d for %s %s: DEV %s\n", mci->mc_idx,
drivers/edac/edac_mc.c +2 -2
 		mci->mod_name, mci->ctl_name, dev_name(mci->dev));

@@ -1877,7 +1877,7 @@ static inline void check_mc_devices(void)
 	struct mem_ctl_info *mci;
 
 	debugf3("%s()\n", __func__);
-	down(&mem_ctls_mutex);
+	mutex_lock(&mem_ctls_mutex);
 
 	list_for_each(item, &mc_devices) {
 		mci = list_entry(item, struct mem_ctl_info, link);

@@ -1886,7 +1886,7 @@ static inline void check_mc_devices(void)
 			mci->edac_check(mci);
 	}
 
-	up(&mem_ctls_mutex);
+	mutex_unlock(&mem_ctls_mutex);
 }
 
 /*
Signature · 16 lines
-- 
Matthias Kaehlcke
Linux Application Developer
Barcelona

                Don't walk behind me, I may not lead
             Don't walk in front of me, I may not follow
                Just walk beside me and be my friend
                          (Albert Camus)
                                                                
.''`.
    using free software / Debian GNU/Linux | http://debian.org  : :' 
:
                                                                `.
`'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4                  `-