- swsusp-change-pm_ops-handling-by-userland-interface-fix.patch removed from -mm tree

- swsusp-change-pm_ops-handling-by-userland-interface-fix.patch removed from -mm tree

[akpm]

The patch titled
     swsusp: fix possible oops in userland interface
has been removed from the -mm tree.  Its filename was
     swsusp-change-pm_ops-handling-by-userland-interface-fix.patch

This patch was dropped because it was folded into swsusp-change-pm_ops-handling-by-userland-interface.patch

------------------------------------------------------
Subject: swsusp: fix possible oops in userland interface
From: "Rafael J. Wysocki" <rjw@sisk.pl>

The SNAPSHOT_PMOPS and SNAPSHOT_S2RAM ioctls can Oops if they are called
from a kernel that doesn't set pm_ops (eg.  non-ACPI kernel on a PC).  Fix
it.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

diff -puN kernel/power/user.c~swsusp-change-pm_ops-handling-by-userland-interface-fix kernel/power/user.c
--- a/kernel/power/user.c~swsusp-change-pm_ops-handling-by-userland-interface-fix
+++ a/kernel/power/user.c
@@ -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:
_

Patches currently in -mm which might be from rjw@sisk.pl are

pm-change-code-ordering-in-mainc.patch
swsusp-change-code-ordering-in-diskc.patch
swsusp-change-code-order-in-diskc-fix.patch
swsusp-change-code-ordering-in-userc.patch
swsusp-change-code-ordering-in-userc-sanity.patch
swsusp-change-pm_ops-handling-by-userland-interface.patch
swsusp-change-pm_ops-handling-by-userland-interface-fix.patch
shrink_slab-handle-bad-shrinkers.patch