Enable swsusp on SMP machines

[Pavel Machek]

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!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[Matthew Garrett]

Pavel Machek <pa...@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.l...@srcf.ucam.org

[Pavel Machek]

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!