On Saturday, 3 February 2007 22:02, Stefan Seyfried wrote:
> On Fri, Feb 02, 2007 at 07:39:30PM +0100, Rafael J. Wysocki wrote:
> 
> > I think I can prepare the -mm patch.
> 
> Thanks, i owe you one :-)

Ah, no big deal, that was easy. ;-)  Patch appended.

An unrelated question: what do I need to do to replace the OpenSUSE's 10.2
s2ram/s2disk/resume with the current CVS, so that they use my config files
instead of whatever they use by default?

Rafael


 kernel/power/user.c |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

Index: linux-2.6.20-rc6-mm3/kernel/power/user.c
===================================================================
--- linux-2.6.20-rc6-mm3.orig/kernel/power/user.c       2007-02-04 
18:36:21.000000000 +0100
+++ linux-2.6.20-rc6-mm3/kernel/power/user.c    2007-02-04 18:56:53.000000000 
+0100
@@ -341,6 +341,11 @@ static int snapshot_ioctl(struct inode *
                break;
 
        case SNAPSHOT_S2RAM:
+               if (!pm_ops) {
+                       error = -ENOSYS;
+                       break;
+               }
+
                if (!data->frozen) {
                        error = -EPERM;
                        break;
@@ -383,8 +388,12 @@ static int snapshot_ioctl(struct inode *
                switch (arg) {
 
                case PMOPS_PREPARE:
-                       data->platform_suspend = 1;
-                       error = 0;
+                       if (pm_ops && pm_ops->enter) {
+                               data->platform_suspend = 1;
+                               error = 0;
+                       } else {
+                               error = -ENOSYS;
+                       }
                        break;
 
                case PMOPS_ENTER:

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Suspend-devel mailing list
Suspend-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/suspend-devel

Reply via email to