Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[firefly-linux-kernel-4.4.55.git] / drivers / s390 / char / sclp_cmd.c

diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index 032171e335e9df5789a2ab1a1413d534dc20130f..766cb7b19b403fedadc2fecee3d9c24cc7bee273 100644 (file)
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -362,7 +362,17 @@ out:
 
 static int sclp_assign_storage(u16 rn)
 {
-       return do_assign_storage(0x000d0001, rn);
+       unsigned long long start, address;
+       int rc;
+
+       rc = do_assign_storage(0x000d0001, rn);
+       if (rc)
+               goto out;
+       start = address = rn2addr(rn);
+       for (; address < start + rzm; address += PAGE_SIZE)
+               page_set_storage_key(address, PAGE_DEFAULT_KEY, 0);
+out:
+       return rc;
 }
 
 static int sclp_unassign_storage(u16 rn)