* Enable swsusp on SMP machines
@ 2005-01-24 17:19 Pavel Machek
2005-01-24 18:30 ` Matthew Garrett
0 siblings, 1 reply; 3+ messages in thread
From: Pavel Machek @ 2005-01-24 17:19 UTC (permalink / raw)
To: arpanet, Andrew Morton, kernel list
Hi!
This enables swsusp on SMP machines. It should be working in 2.6.10,
already (but you may need noapic in 2.6.10). Please apply,
Pavel
--- /data/l/READ-ONLY/linux/kernel/power/main.c 2005-01-16 23:10:29.000000000 +0100
+++ linux/kernel/power/main.c 2005-01-24 17:59:14.000000000 +0100
@@ -141,14 +141,14 @@
if (down_trylock(&pm_sem))
return -EBUSY;
- /* Suspend is hard to get right on SMP. */
- if (num_online_cpus() != 1) {
- error = -EPERM;
+ if (state == PM_SUSPEND_DISK) {
+ error = pm_suspend_disk();
goto Unlock;
}
- if (state == PM_SUSPEND_DISK) {
- error = pm_suspend_disk();
+ /* Suspend is hard to get right on SMP. */
+ if (num_online_cpus() != 1) {
+ error = -EPERM;
goto Unlock;
}
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Enable swsusp on SMP machines
2005-01-24 17:19 Enable swsusp on SMP machines Pavel Machek
@ 2005-01-24 18:30 ` Matthew Garrett
2005-01-25 8:42 ` Pavel Machek
0 siblings, 1 reply; 3+ messages in thread
From: Matthew Garrett @ 2005-01-24 18:30 UTC (permalink / raw)
To: Pavel Machek; +Cc: linux-kernel
Pavel Machek <pavel@ucw.cz> wrote:
> - /* Suspend is hard to get right on SMP. */
> - if (num_online_cpus() != 1) {
> - error = -EPERM;
> + if (state == PM_SUSPEND_DISK) {
> + error = pm_suspend_disk();
> goto Unlock;
> }
>
> - if (state == PM_SUSPEND_DISK) {
> - error = pm_suspend_disk();
> + /* Suspend is hard to get right on SMP. */
> + if (num_online_cpus() != 1) {
> + error = -EPERM;
> goto Unlock;
> }
Are you sure about this?
--
Matthew Garrett | mjg59-chiark.mail.linux-rutgers.kernel@srcf.ucam.org
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Enable swsusp on SMP machines
2005-01-24 18:30 ` Matthew Garrett
@ 2005-01-25 8:42 ` Pavel Machek
0 siblings, 0 replies; 3+ messages in thread
From: Pavel Machek @ 2005-01-25 8:42 UTC (permalink / raw)
To: Matthew Garrett; +Cc: linux-kernel
Hi!
> > - /* Suspend is hard to get right on SMP. */
> > - if (num_online_cpus() != 1) {
> > - error = -EPERM;
> > + if (state == PM_SUSPEND_DISK) {
> > + error = pm_suspend_disk();
> > goto Unlock;
> > }
> >
> > - if (state == PM_SUSPEND_DISK) {
> > - error = pm_suspend_disk();
> > + /* Suspend is hard to get right on SMP. */
> > + if (num_online_cpus() != 1) {
> > + error = -EPERM;
> > goto Unlock;
> > }
>
> Are you sure about this?
Yes, as we already agreed on in private mails ;-). The diff really is
confusing.
Pavel
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-01-25 8:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-01-24 17:19 Enable swsusp on SMP machines Pavel Machek
2005-01-24 18:30 ` Matthew Garrett
2005-01-25 8:42 ` Pavel Machek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome