]> err.no Git - linux-2.6/commit
[PATCH] Revert "swsusp: disable nonboot CPUs before entering platform suspend"
authorRafael J. Wysocki <rjw@sisk.pl>
Tue, 27 Mar 2007 10:09:13 +0000 (12:09 +0200)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 27 Mar 2007 16:20:03 +0000 (09:20 -0700)
commit436ce71638eceb0f9dd7608157807c37b29c3db7
tree9f1e70f14650a23363a90aa7a1cd35dc54ec93bb
parentc7f6d15ff2664467a2cb669abcabb5ffaf719b2d
[PATCH] Revert "swsusp: disable nonboot CPUs before entering platform suspend"

This reverts commit 94985134b7b46848267ed6b734320db01c974e72 and
insteads removes the WARN_ON() that caused that commit in the first
place.

The problem is that we call disable_nonboot_cpus() in swsusp before
powering down the system in order to avoid triggering the WARN_ON()
in arch/x86_64/kernel/acpi/sleep.c:init_low_mapping() and this doesn't
work well on Thomas' system.

So instead, remove the WARN_ON() in arch/x86_64/kernel/acpi/sleep.c:
init_low_mapping(), which triggers every time during the suspend to disk
in the platform mode, as the potential problem it is related to doesn't
seem to occur in practice.

[ I think we might want to disallow the case of multiple users of that
  mm, or something.  Normally, playing with the current process page
  tables on the current CPU should be fine as long as we don't have
  other threads using those tables at the same time..

  Anyway, not pretty, but better than the warning or the lockup - Linus ]

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86_64/kernel/acpi/sleep.c
kernel/power/disk.c
kernel/power/user.c