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>

6 files changed, 24 insertions, 24 deletions

diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index 4e8215e0d4b6..09a94cd9debc 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -867,7 +867,7 @@ static inline void
 debug_finish_entry(debug_info_t * id, debug_entry_t* active, int level,
                         int exception)
 {
-        active->id.stck = get_clock();
+        active->id.stck = get_tod_clock();
         active->id.fields.cpuid = smp_processor_id();
         active->caller = __builtin_return_address(0);
         active->id.fields.exception = exception;
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;
diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c
index 7918fbea36bb..504175ebf8b0 100644
--- a/arch/s390/kernel/nmi.c
+++ b/arch/s390/kernel/nmi.c
@@ -293,7 +293,7 @@ void notrace s390_do_machine_check(struct pt_regs *regs)
                          * retry this instruction.
                          */
                         spin_lock(&ipd_lock);
-                        tmp = get_clock();
+                        tmp = get_tod_clock();
                         if (((tmp - last_ipd) >> 12) < MAX_IPD_TIME)
                                 ipd_count++;
                         else
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 7433a2f9e5cc..549c9d173c0f 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -365,16 +365,16 @@ void smp_emergency_stop(cpumask_t *cpumask)
         u64 end;
         int cpu;
 
-        end = get_clock() + (1000000UL << 12);
+        end = get_tod_clock() + (1000000UL << 12);
         for_each_cpu(cpu, cpumask) {
                 struct pcpu *pcpu = pcpu_devices + cpu;
                 set_bit(ec_stop_cpu, &pcpu->ec_mask);
                 while (__pcpu_sigp(pcpu->address, SIGP_EMERGENCY_SIGNAL,
                                    0, NULL) == SIGP_CC_BUSY &&
-                       get_clock() < end)
+                       get_tod_clock() < end)
                         cpu_relax();
         }
-        while (get_clock() < end) {
+        while (get_tod_clock() < end) {
                 for_each_cpu(cpu, cpumask)
                         if (pcpu_stopped(pcpu_devices + cpu))
                                 cpumask_clear_cpu(cpu, cpumask);
@@ -694,7 +694,7 @@ static void __init smp_detect_cpus(void)
  */
 static void __cpuinit smp_start_secondary(void *cpuvoid)
 {
-        S390_lowcore.last_update_clock = get_clock();
+        S390_lowcore.last_update_clock = get_tod_clock();
         S390_lowcore.restart_stack = (unsigned long) restart_stack;
         S390_lowcore.restart_fn = (unsigned long) do_restart;
         S390_lowcore.restart_data = 0;
@@ -947,7 +947,7 @@ static ssize_t show_idle_time(struct device *dev,
         unsigned int sequence;
 
         do {
-                now = get_clock();
+                now = get_tod_clock();
                 sequence = ACCESS_ONCE(idle->sequence);
                 idle_time = ACCESS_ONCE(idle->idle_time);
                 idle_enter = ACCESS_ONCE(idle->clock_idle_enter);
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 0aa98db8a80d..876546b9cfa1 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -63,7 +63,7 @@ static DEFINE_PER_CPU(struct clock_event_device, comparators);
  */
 unsigned long long notrace __kprobes sched_clock(void)
 {
-        return tod_to_ns(get_clock_monotonic());
+        return tod_to_ns(get_tod_clock_monotonic());
 }
 
 /*
@@ -194,7 +194,7 @@ static void stp_reset(void);
 
 void read_persistent_clock(struct timespec *ts)
 {
-        tod_to_timeval(get_clock() - TOD_UNIX_EPOCH, ts);
+        tod_to_timeval(get_tod_clock() - TOD_UNIX_EPOCH, ts);
 }
 
 void read_boot_clock(struct timespec *ts)
@@ -204,7 +204,7 @@ void read_boot_clock(struct timespec *ts)
 
 static cycle_t read_tod_clock(struct clocksource *cs)
 {
-        return get_clock();
+        return get_tod_clock();
 }
 
 static struct clocksource clocksource_tod = {
@@ -342,7 +342,7 @@ int get_sync_clock(unsigned long long *clock)
 
         sw_ptr = &get_cpu_var(clock_sync_word);
         sw0 = atomic_read(sw_ptr);
-        *clock = get_clock();
+        *clock = get_tod_clock();
         sw1 = atomic_read(sw_ptr);
         put_cpu_var(clock_sync_word);
         if (sw0 == sw1 && (sw0 & 0x80000000U))
@@ -486,7 +486,7 @@ static void etr_reset(void)
                 .p0 = 0, .p1 = 0, ._pad1 = 0, .ea = 0,
                 .es = 0, .sl = 0 };
         if (etr_setr(&etr_eacr) == 0) {
-                etr_tolec = get_clock();
+                etr_tolec = get_tod_clock();
                 set_bit(CLOCK_SYNC_HAS_ETR, &clock_sync_flags);
                 if (etr_port0_online && etr_port1_online)
                         set_bit(CLOCK_SYNC_ETR, &clock_sync_flags);
@@ -768,8 +768,8 @@ static int etr_sync_clock(void *data)
         __ctl_set_bit(14, 21);
         __ctl_set_bit(0, 29);
         clock = ((unsigned long long) (aib->edf2.etv + 1)) << 32;
-        old_clock = get_clock();
-        if (set_clock(clock) == 0) {
+        old_clock = get_tod_clock();
+        if (set_tod_clock(clock) == 0) {
                 __udelay(1);    /* Wait for the clock to start. */
                 __ctl_clear_bit(0, 29);
                 __ctl_clear_bit(14, 21);
@@ -845,7 +845,7 @@ static struct etr_eacr etr_handle_events(struct etr_eacr eacr)
                          * assume that this can have caused an stepping
                          * port switch.
                          */
-                        etr_tolec = get_clock();
+                        etr_tolec = get_tod_clock();
                 eacr.p0 = etr_port0_online;
                 if (!eacr.p0)
                         eacr.e0 = 0;
@@ -858,7 +858,7 @@ static struct etr_eacr etr_handle_events(struct etr_eacr eacr)
                          * assume that this can have caused an stepping
                          * port switch.
                          */
-                        etr_tolec = get_clock();
+                        etr_tolec = get_tod_clock();
                 eacr.p1 = etr_port1_online;
                 if (!eacr.p1)
                         eacr.e1 = 0;
@@ -974,7 +974,7 @@ static void etr_update_eacr(struct etr_eacr eacr)
         etr_eacr = eacr;
         etr_setr(&etr_eacr);
         if (dp_changed)
-                etr_tolec = get_clock();
+                etr_tolec = get_tod_clock();
 }
 
 /*
@@ -1012,7 +1012,7 @@ static void etr_work_fn(struct work_struct *work)
         /* Store aib to get the current ETR status word. */
         BUG_ON(etr_stetr(&aib) != 0);
         etr_port0.esw = etr_port1.esw = aib.esw;        /* Copy status word. */
-        now = get_clock();
+        now = get_tod_clock();
 
         /*
          * Update the port information if the last stepping port change
@@ -1537,10 +1537,10 @@ static int stp_sync_clock(void *data)
         if (stp_info.todoff[0] || stp_info.todoff[1] ||
             stp_info.todoff[2] || stp_info.todoff[3] ||
             stp_info.tmd != 2) {
-                old_clock = get_clock();
+                old_clock = get_tod_clock();
                 rc = chsc_sstpc(stp_page, STP_OP_SYNC, 0);
                 if (rc == 0) {
-                        delta = adjust_time(old_clock, get_clock(), 0);
+                        delta = adjust_time(old_clock, get_tod_clock(), 0);
                         fixup_clock_comparator(delta);
                         rc = chsc_sstpi(stp_page, &stp_info,
                                         sizeof(struct stp_sstpi));
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index e84b8b68444a..8911a169af44 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -191,7 +191,7 @@ cputime64_t s390_get_idle_time(int cpu)
         unsigned int sequence;
 
         do {
-                now = get_clock();
+                now = get_tod_clock();
                 sequence = ACCESS_ONCE(idle->sequence);
                 idle_enter = ACCESS_ONCE(idle->clock_idle_enter);
                 idle_exit = ACCESS_ONCE(idle->clock_idle_exit);