aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/vtime.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-01-30 03:49:40 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-02-14 09:55:10 -0500
commit1aae0560d160ee6ebef927a35e4f405306a079df (patch)
tree70809629dccba1bf31e067dfcd3a20fe58b6d24e /arch/s390/kernel/vtime.c
parent58fece7827a7cc40e02bc68a7db8229166984893 (diff)
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>
Diffstat (limited to 'arch/s390/kernel/vtime.c')
-rw-r--r--arch/s390/kernel/vtime.c2
1 files changed, 1 insertions, 1 deletions
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)
191 unsigned int sequence; 191 unsigned int sequence;
192 192
193 do { 193 do {
194 now = get_clock(); 194 now = get_tod_clock();
195 sequence = ACCESS_ONCE(idle->sequence); 195 sequence = ACCESS_ONCE(idle->sequence);
196 idle_enter = ACCESS_ONCE(idle->clock_idle_enter); 196 idle_enter = ACCESS_ONCE(idle->clock_idle_enter);
197 idle_exit = ACCESS_ONCE(idle->clock_idle_exit); 197 idle_exit = ACCESS_ONCE(idle->clock_idle_exit);