Suspend: Invoke suspend notifications after console switch
authorJohannes Berg <johannes@sipsolutions.net>
Fri, 11 Jan 2008 00:22:23 +0000 (01:22 +0100)
committerLen Brown <len.brown@intel.com>
Fri, 1 Feb 2008 23:30:58 +0000 (18:30 -0500)
commitaf258f516b3e4e214121f5d6d53cab32ce0d8010
tree9ae8987d51217316aecfc0c04806cc6970cd69e6
parent17b7a89cfb6ea2ff103785f9b2580e5138b6cfd1
Suspend: Invoke suspend notifications after console switch

In order to fix APM emulation it is necessary to enable apm-emulation
notifications for suspends triggered in various ways via the suspend
notifiers.  However, this will cause the systems using APM emulation
to lock up between X being needed to switch away from the VT and X
already waiting for resume in the APM ioctl.

This patch moves the console switch (if enabled) before the suspend
notification (and after the resume notification) to avoid this issue.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
kernel/power/main.c