s390/hypfs: use store_tod_clock_ext()

Use store_tod_clock_ext() instead of get_tod_clock_ext().
Unfortunately one usage has to be converted to a cast, since
otherwise a uapi header file would have to be changed.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/hypfs/hypfs_diag0c.c b/arch/s390/hypfs/hypfs_diag0c.c
index 3235e4d82f2d550c209baaa6d94c5800e73c56c3..6c43d2ba207974617b604ed3108801dfb4921565 100644 (file)
--- a/arch/s390/hypfs/hypfs_diag0c.c
+++ b/arch/s390/hypfs/hypfs_diag0c.c
@@ -84,7 +84,7 @@ static int dbfs_diag0c_create(void **data, void **data_free_ptr, size_t *size)
        if (IS_ERR(diag0c_data))
                return PTR_ERR(diag0c_data);
        memset(&diag0c_data->hdr, 0, sizeof(diag0c_data->hdr));
-       get_tod_clock_ext(diag0c_data->hdr.tod_ext);
+       store_tod_clock_ext((union tod_clock *)diag0c_data->hdr.tod_ext);
        diag0c_data->hdr.len = count * sizeof(struct hypfs_diag0c_entry);
        diag0c_data->hdr.version = DBFS_D0C_HDR_VERSION;
        diag0c_data->hdr.count = count;

diff --git a/arch/s390/hypfs/hypfs_vm.c b/arch/s390/hypfs/hypfs_vm.c
index e1fcc03159ef25c42e90fa55e072f9914602ee5c..33f973ff974420e94fddcd221d66740a9ad7cec3 100644 (file)
--- a/arch/s390/hypfs/hypfs_vm.c
+++ b/arch/s390/hypfs/hypfs_vm.c
@@ -234,7 +234,7 @@ failed:
 struct dbfs_d2fc_hdr {
        u64     len;            /* Length of d2fc buffer without header */
        u16     version;        /* Version of header */
-       char    tod_ext[STORE_CLOCK_EXT_SIZE]; /* TOD clock for d2fc */
+       union tod_clock tod_ext; /* TOD clock for d2fc */
        u64     count;          /* Number of VM guests in d2fc buffer */
        char    reserved[30];
 } __attribute__ ((packed));
@@ -252,7 +252,7 @@ static int dbfs_diag2fc_create(void **data, void **data_free_ptr, size_t *size)
        d2fc = diag2fc_store(guest_query, &count, sizeof(d2fc->hdr));
        if (IS_ERR(d2fc))
                return PTR_ERR(d2fc);
-       get_tod_clock_ext(d2fc->hdr.tod_ext);
+       store_tod_clock_ext(&d2fc->hdr.tod_ext);
        d2fc->hdr.len = count * sizeof(struct diag2fc_data);
        d2fc->hdr.version = DBFS_D2FC_HDR_VERSION;
        d2fc->hdr.count = count;