s390/time: rename tod clock access functions

Fix name clash with some common code device drivers and add "tod"
to all tod clock access function names.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 1f0eee9e7daa..1ee98e56fc6a 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -47,10 +47,10 @@ static void __init reset_tod_clock(void)
 {
         u64 time;
 
-        if (store_clock(&time) == 0)
+        if (store_tod_clock(&time) == 0)
                 return;
         /* TOD clock not running. Set the clock to Unix Epoch. */
-        if (set_clock(TOD_UNIX_EPOCH) != 0 || store_clock(&time) != 0)
+        if (set_tod_clock(TOD_UNIX_EPOCH) != 0 || store_tod_clock(&time) != 0)
                 disabled_wait(0);
 
         sched_clock_base_cc = TOD_UNIX_EPOCH;
@@ -173,7 +173,7 @@ static noinline __init void create_kernel_nss(void)
         }
 
         /* re-initialize cputime accounting. */
-        sched_clock_base_cc = get_clock();
+        sched_clock_base_cc = get_tod_clock();
         S390_lowcore.last_update_clock = sched_clock_base_cc;
         S390_lowcore.last_update_timer = 0x7fffffffffffffffULL;
         S390_lowcore.user_timer = 0;