Hi! > --- linux-2.6.orig/include/linux/pm.h 2007-03-20 02:18:54.830252495 +0100 > +++ linux-2.6/include/linux/pm.h 2007-03-20 09:45:16.760886698 +0100 > @@ -112,6 +112,8 @@ typedef int __bitwise suspend_state_t; > > typedef int __bitwise suspend_disk_method_t; > > +/* invalid must be 0 so struct pm_ops initialisers can leave it out */ > +#define PM_DISK_INVALID ((__force suspend_disk_method_t) 0) > #define PM_DISK_FIRMWARE ((__force suspend_disk_method_t) 1) > #define PM_DISK_PLATFORM ((__force suspend_disk_method_t) 2) > #define PM_DISK_SHUTDOWN ((__force suspend_disk_method_t) 3) > @@ -137,17 +139,18 @@ typedef int __bitwise suspend_disk_metho > * @finish: Called when the system has left the given state and all devices > * are resumed. The return value is ignored. > * > - * @pm_disk_mode: Set to the disk method that the user should be able to > - * configure for suspend-to-disk. Since %PM_DISK_SHUTDOWN, > - * %PM_DISK_REBOOT, %PM_DISK_TEST and %PM_DISK_TESTPROC > - * are always allowed, currently only %PM_DISK_PLATFORM > - * makes sense. If the user then choses %PM_DISK_PLATFORM, > - * the @prepare call will be called before suspending to disk > - * (if present), the @enter call should be present and will > - * be called after all state has been saved and the machine > - * is ready to be shut down/suspended/..., and the @finish > - * callback is called after state has been restored. All > - * these calls are called with %PM_SUSPEND_DISK as the state. > + * @pm_disk_mode: The generic code always allows one of the shutdown methods > + * %PM_DISK_SHUTDOWN, %PM_DISK_REBOOT, %PM_DISK_TEST and > + * %PM_DISK_TESTPROC. If this variable is set, the mode it is set > + * to is allowed in addition to those modes and is also made default. > + * When this mode is sent selected, the @prepare call will be called > + * before suspending to disk (if present), the @enter call should be > + * present and will be called after all state has been saved and the > + * machine is ready to be powered off; the @finish callback is called > + * after state has been restored. All these calls are called with > + * %PM_SUSPEND_DISK as the state. Is the pm_disk_mode still bitmask? If yes, say so. ...no, it does not appear so. > --- linux-2.6.orig/kernel/power/main.c 2007-03-20 02:18:54.850252495 +0100 > +++ linux-2.6/kernel/power/main.c 2007-03-20 09:44:44.610886698 +0100 > @@ -30,7 +30,7 @@ > DEFINE_MUTEX(pm_mutex); > > struct pm_ops *pm_ops; > -suspend_disk_method_t pm_disk_mode = PM_DISK_PLATFORM; > +suspend_disk_method_t pm_disk_mode = PM_DISK_SHUTDOWN; Please don't do this. We want to keep the "use platform if available" behaviour. [Changing platform->shutdown is really _big_ change, independend from any cleanups, and it needs to go separate at the very least. It will break some machines.] Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html _______________________________________________ linux-pm mailing list linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/linux-pm
