diff options
| author |   Jan Höppner <hoeppner@linux.vnet.ibm.com> | 2017-08-15 16:40:18 +0200 |
|---|---|---|
| committer |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-08-23 13:31:51 +0200 |
| commit | 7bf76f0169538279b78536393639859eeb7d93f1 (patch) | |
| tree | 13b375fe94bdac9606cb4d210e867b51cf75a0fa /arch/s390/kernel/time.c | |
| parent | s390/smp: convert cpuhp_setup_state() return code to zero on success (diff) | |
| download | linux-dev-7bf76f0169538279b78536393639859eeb7d93f1.tar.xz linux-dev-7bf76f0169538279b78536393639859eeb7d93f1.zip | |
s390/dasd: Change unsigned long long to unsigned long
Unsigned long long and unsigned long were different in size for 31-bit.
For 64-bit the size for both datatypes is 8 Bytes and since the support
for 31-bit is long gone we can clean up a little and change everything
to unsigned long.
Change get_phys_clock() along the way to accept unsigned long as well so
that the DASD code can be consistent.
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/time.c')
| -rw-r--r-- | arch/s390/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 15abecba068e..5cbd52169348 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -357,7 +357,7 @@ static unsigned long clock_sync_flags; * source. If the clock mode is local it will return -EOPNOTSUPP and * -EAGAIN if the clock is not in sync with the external reference. */ -int get_phys_clock(unsigned long long *clock) +int get_phys_clock(unsigned long *clock) { atomic_t *sw_ptr; unsigned int sw0, sw1; |