diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-01-30 12:49:40 +0400 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-02-14 18:55:10 +0400 |
| commit | 1aae0560d160ee6ebef927a35e4f405306a079df (patch) | |
| tree | 70809629dccba1bf31e067dfcd3a20fe58b6d24e /drivers/s390/cio/css.c | |
| parent | 58fece7827a7cc40e02bc68a7db8229166984893 (diff) | |
| download | linux-1aae0560d160ee6ebef927a35e4f405306a079df.tar.xz | |
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 'drivers/s390/cio/css.c')
| -rw-r--r-- | drivers/s390/cio/css.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index fd00afd8b850..a239237d43f3 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c @@ -780,7 +780,7 @@ static int __init setup_css(int nr) css->cssid = nr; dev_set_name(&css->device, "css%x", nr); css->device.release = channel_subsystem_release; - tod_high = (u32) (get_clock() >> 32); + tod_high = (u32) (get_tod_clock() >> 32); css_generate_pgid(css, tod_high); return 0; } |