Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[karo-tx-linux.git] / drivers / s390 / cio / cio.c

diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index c8faf6230b0f332010678f5c4aced898cb20b66d..986ef6a92a410ad893127ff786fe43774d9e0daa 100644 (file)
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -962,9 +962,9 @@ static void css_reset(void)
                        atomic_inc(&chpid_reset_count);
        }
        /* Wait for machine check for all channel paths. */
-       timeout = get_clock() + (RCHP_TIMEOUT << 12);
+       timeout = get_tod_clock() + (RCHP_TIMEOUT << 12);
        while (atomic_read(&chpid_reset_count) != 0) {
-               if (get_clock() > timeout)
+               if (get_tod_clock() > timeout)
                        break;
                cpu_relax();
        }