Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index 5cc11c636d38..4b60ede07f0e 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -84,6 +84,7 @@ static void __init sclp_read_info_early(void)
                 do {
                         memset(sccb, 0, sizeof(*sccb));
                         sccb->header.length = sizeof(*sccb);
+                        sccb->header.function_code = 0x80;
                         sccb->header.control_mask[2] = 0x80;
                         rc = sclp_cmd_sync_early(commands[i], sccb);
                 } while (rc == -EBUSY);
@@ -307,6 +308,13 @@ struct assign_storage_sccb {
         u16 rn;
 } __packed;
 
+int arch_get_memory_phys_device(unsigned long start_pfn)
+{
+        if (!rzm)
+                return 0;
+        return PFN_PHYS(start_pfn) >> ilog2(rzm);
+}
+
 static unsigned long long rn2addr(u16 rn)
 {
         return (unsigned long long) (rn - 1) * rzm;
@@ -546,7 +554,7 @@ struct read_storage_sccb {
         u32 entries[0];
 } __packed;
 
-static struct dev_pm_ops sclp_mem_pm_ops = {
+static const struct dev_pm_ops sclp_mem_pm_ops = {
         .freeze         = sclp_mem_freeze,
 };