From e7482e2476533abd5f7874f7a44f583743464456 Mon Sep 17 00:00:00 2001
From: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Date: Wed, 20 Sep 2006 15:59:52 +0200
Subject: [PATCH] --- yaml --- r: 34191 b: refs/heads/master c:
 dcd707b4bdc10b4fa20efa116dbaeded21513115 h: refs/heads/master i:   34189:
 2aa4d6a0b43780ba90f1751315e082fdeb975236   34187:
 5e92b7ab3a5dd3a89a5b34faa4f24dfc86ed1c04   34183:
 e703e2500e001cfe067baf49d82352f95186033a   34175:
 2b45b188d68e4f8ab8d5605b9493a83cb2e711e8 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/s390/block/dasd_devmap.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 99e996f3a4e3..9a0bb592209b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db0c2d59087296b3567ec408abe17108db88b385
+refs/heads/master: dcd707b4bdc10b4fa20efa116dbaeded21513115
diff --git a/trunk/drivers/s390/block/dasd_devmap.c b/trunk/drivers/s390/block/dasd_devmap.c
index 80cf0999465a..91cf971f0652 100644
--- a/trunk/drivers/s390/block/dasd_devmap.c
+++ b/trunk/drivers/s390/block/dasd_devmap.c
@@ -258,8 +258,12 @@ dasd_parse_keyword( char *parsestring ) {
                 return residual_str;
         }
 	if (strncmp("nopav", parsestring, length) == 0) {
-		dasd_nopav = 1;
-		MESSAGE(KERN_INFO, "%s", "disable PAV mode");
+		if (MACHINE_IS_VM)
+			MESSAGE(KERN_INFO, "%s", "'nopav' not supported on VM");
+		else {
+			dasd_nopav = 1;
+			MESSAGE(KERN_INFO, "%s", "disable PAV mode");
+		}
 		return residual_str;
 	}
 	if (strncmp("fixedbuffers", parsestring, length) == 0) {