From: Stephen Hemminger <shemminger@osdl.org>
To: Linus Torvalds <torvalds@osdl.org>, Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@osdl.org>, Pavel Machek <pavel@suse.cz>
Cc: linux-pm@osdl.org
Subject: [PATCH] convert pm_sem to a mutex
Date: Fri, 17 Nov 2006 11:13:08 -0800 [thread overview]
Message-ID: <20061117111308.5dbaa60e@freekitty> (raw)
The power management semaphore is only used as mutex, so convert it.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
--- linux-2.6.19-rc6.orig/kernel/power/disk.c 2006-11-17 10:54:21.000000000 -0800
+++ linux-2.6.19-rc6/kernel/power/disk.c 2006-11-17 10:50:54.000000000 -0800
@@ -189,10 +189,10 @@
{
int error;
- down(&pm_sem);
+ mutex_lock(&pm_mutex);
if (!swsusp_resume_device) {
if (!strlen(resume_file)) {
- up(&pm_sem);
+ mutex_unlock(&pm_mutex);
return -ENOENT;
}
swsusp_resume_device = name_to_dev_t(resume_file);
@@ -207,7 +207,7 @@
* FIXME: If noresume is specified, we need to find the partition
* and reset it back to normal swap space.
*/
- up(&pm_sem);
+ mutex_unlock(&pm_mutex);
return 0;
}
@@ -251,7 +251,7 @@
unprepare_processes();
Done:
/* For success case, the suspend path will release the lock */
- up(&pm_sem);
+ mutex_unlock(&pm_mutex);
pr_debug("PM: Resume from disk failed.\n");
return 0;
}
@@ -312,7 +312,7 @@
p = memchr(buf, '\n', n);
len = p ? p - buf : n;
- down(&pm_sem);
+ mutex_lock(&pm_mutex);
for (i = PM_DISK_FIRMWARE; i < PM_DISK_MAX; i++) {
if (!strncmp(buf, pm_disk_modes[i], len)) {
mode = i;
@@ -336,7 +336,7 @@
pr_debug("PM: suspend-to-disk mode set to '%s'\n",
pm_disk_modes[mode]);
- up(&pm_sem);
+ mutex_unlock(&pm_mutex);
return error ? error : n;
}
@@ -361,9 +361,9 @@
if (maj != MAJOR(res) || min != MINOR(res))
goto out;
- down(&pm_sem);
+ mutex_lock(&pm_mutex);
swsusp_resume_device = res;
- up(&pm_sem);
+ mutex_unlock(&pm_mutex);
printk("Attempting manual resume\n");
noresume = 0;
software_resume();
--- sky2.orig/kernel/power/main.c 2006-11-17 10:54:21.000000000 -0800
+++ sky2/kernel/power/main.c 2006-11-17 10:55:24.000000000 -0800
@@ -24,7 +24,7 @@
/*This is just an arbitrary number */
#define FREE_PAGE_NUMBER (100)
-DECLARE_MUTEX(pm_sem);
+DEFINE_MUTEX(pm_mutex);
struct pm_ops *pm_ops;
suspend_disk_method_t pm_disk_mode = PM_DISK_SHUTDOWN;
@@ -36,9 +36,9 @@
void pm_set_ops(struct pm_ops * ops)
{
- down(&pm_sem);
+ mutex_lock(&pm_mutex);
pm_ops = ops;
- up(&pm_sem);
+ mutex_unlock(&pm_mutex);
}
@@ -182,7 +182,7 @@
if (!valid_state(state))
return -ENODEV;
- if (down_trylock(&pm_sem))
+ if (mutex_trylock(&pm_mutex))
return -EBUSY;
if (state == PM_SUSPEND_DISK) {
@@ -200,7 +200,7 @@
pr_debug("PM: Finishing wakeup.\n");
suspend_finish(state);
Unlock:
- up(&pm_sem);
+ mutex_unlock(&pm_mutex);
return error;
}
--- sky2.orig/kernel/power/power.h 2006-11-17 10:49:25.000000000 -0800
+++ sky2/kernel/power/power.h 2006-11-17 10:49:55.000000000 -0800
@@ -22,7 +22,9 @@
return -EPERM;
}
#endif
-extern struct semaphore pm_sem;
+
+extern struct mutex pm_mutex;
+
#define power_attr(_name) \
static struct subsys_attribute _name##_attr = { \
.attr = { \
--- sky2.orig/kernel/power/user.c 2006-11-17 10:54:21.000000000 -0800
+++ sky2/kernel/power/user.c 2006-11-17 10:55:42.000000000 -0800
@@ -76,10 +76,10 @@
free_all_swap_pages(data->swap, data->bitmap);
free_bitmap(data->bitmap);
if (data->frozen) {
- down(&pm_sem);
+ mutex_lock(&pm_mutex);
thaw_processes();
enable_nonboot_cpus();
- up(&pm_sem);
+ mutex_unlock(&pm_mutex);
}
atomic_inc(&device_available);
return 0;
@@ -140,7 +140,7 @@
case SNAPSHOT_FREEZE:
if (data->frozen)
break;
- down(&pm_sem);
+ mutex_lock(&pm_mutex);
error = disable_nonboot_cpus();
if (!error) {
error = freeze_processes();
@@ -150,7 +150,7 @@
error = -EBUSY;
}
}
- up(&pm_sem);
+ mutex_unlock(&pm_mutex);
if (!error)
data->frozen = 1;
break;
@@ -158,10 +158,10 @@
case SNAPSHOT_UNFREEZE:
if (!data->frozen)
break;
- down(&pm_sem);
+ mutex_lock(&pm_mutex);
thaw_processes();
enable_nonboot_cpus();
- up(&pm_sem);
+ mutex_unlock(&pm_mutex);
data->frozen = 0;
break;
@@ -170,7 +170,7 @@
error = -EPERM;
break;
}
- down(&pm_sem);
+ mutex_lock(&pm_mutex);
/* Free memory before shutting down devices. */
error = swsusp_shrink_memory();
if (!error) {
@@ -183,7 +183,7 @@
}
resume_console();
}
- up(&pm_sem);
+ mutex_unlock(&pm_mutex);
if (!error)
error = put_user(in_suspend, (unsigned int __user *)arg);
if (!error)
@@ -197,7 +197,7 @@
break;
}
snapshot_free_unused_memory(&data->handle);
- down(&pm_sem);
+ mutex_lock(&pm_mutex);
pm_prepare_console();
suspend_console();
error = device_suspend(PMSG_PRETHAW);
@@ -207,7 +207,7 @@
}
resume_console();
pm_restore_console();
- up(&pm_sem);
+ mutex_unlock(&pm_mutex);
break;
case SNAPSHOT_FREE:
@@ -282,7 +282,7 @@
break;
}
- if (down_trylock(&pm_sem)) {
+ if (mutex_trylock(&pm_mutex)) {
error = -EBUSY;
break;
}
@@ -310,7 +310,7 @@
pm_ops->finish(PM_SUSPEND_MEM);
OutS3:
- up(&pm_sem);
+ mutex_unlock(&pm_mutex);
break;
default:
next reply other threads:[~2006-11-17 19:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-17 19:13 Stephen Hemminger [this message]
2006-11-17 19:15 ` [PATCH] convert pm_sem to a mutex Ingo Molnar
2006-11-17 21:29 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061117111308.5dbaa60e@freekitty \
--to=shemminger@osdl.org \
--cc=akpm@osdl.org \
--cc=linux-pm@osdl.org \
--cc=mingo@elte.hu \
--cc=pavel@suse.cz \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox