diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-01-30 03:49:40 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-02-14 09:55:10 -0500 |
commit | 1aae0560d160ee6ebef927a35e4f405306a079df (patch) | |
tree | 70809629dccba1bf31e067dfcd3a20fe58b6d24e /arch/s390/appldata | |
parent | 58fece7827a7cc40e02bc68a7db8229166984893 (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/appldata')
-rw-r--r-- | arch/s390/appldata/appldata_mem.c | 2 | ||||
-rw-r--r-- | arch/s390/appldata/appldata_net_sum.c | 2 | ||||
-rw-r--r-- | arch/s390/appldata/appldata_os.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c index 02d9a1cf5057..7ef60b52d6e0 100644 --- a/arch/s390/appldata/appldata_mem.c +++ b/arch/s390/appldata/appldata_mem.c | |||
@@ -108,7 +108,7 @@ static void appldata_get_mem_data(void *data) | |||
108 | mem_data->totalswap = P2K(val.totalswap); | 108 | mem_data->totalswap = P2K(val.totalswap); |
109 | mem_data->freeswap = P2K(val.freeswap); | 109 | mem_data->freeswap = P2K(val.freeswap); |
110 | 110 | ||
111 | mem_data->timestamp = get_clock(); | 111 | mem_data->timestamp = get_tod_clock(); |
112 | mem_data->sync_count_2++; | 112 | mem_data->sync_count_2++; |
113 | } | 113 | } |
114 | 114 | ||
diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c index 1370e358d49a..2d224b945355 100644 --- a/arch/s390/appldata/appldata_net_sum.c +++ b/arch/s390/appldata/appldata_net_sum.c | |||
@@ -111,7 +111,7 @@ static void appldata_get_net_sum_data(void *data) | |||
111 | net_data->tx_dropped = tx_dropped; | 111 | net_data->tx_dropped = tx_dropped; |
112 | net_data->collisions = collisions; | 112 | net_data->collisions = collisions; |
113 | 113 | ||
114 | net_data->timestamp = get_clock(); | 114 | net_data->timestamp = get_tod_clock(); |
115 | net_data->sync_count_2++; | 115 | net_data->sync_count_2++; |
116 | } | 116 | } |
117 | 117 | ||
diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c index 87521ba682e5..de8e2b3b0180 100644 --- a/arch/s390/appldata/appldata_os.c +++ b/arch/s390/appldata/appldata_os.c | |||
@@ -156,7 +156,7 @@ static void appldata_get_os_data(void *data) | |||
156 | } | 156 | } |
157 | ops.size = new_size; | 157 | ops.size = new_size; |
158 | } | 158 | } |
159 | os_data->timestamp = get_clock(); | 159 | os_data->timestamp = get_tod_clock(); |
160 | os_data->sync_count_2++; | 160 | os_data->sync_count_2++; |
161 | } | 161 | } |
162 | 162 | ||