diff options
| author | Jan Höppner | 2017-08-15 16:40:18 +0200 |
|---|---|---|
| committer | Martin Schwidefsky | 2017-08-23 13:31:51 +0200 |
| commit | 7bf76f0169538279b78536393639859eeb7d93f1 (patch) | |
| tree | 13b375fe94bdac9606cb4d210e867b51cf75a0fa /drivers/s390/block/dasd_erp.c | |
| parent | s390/smp: convert cpuhp_setup_state() return code to zero on success (diff) | |
| download | kernel-qcow2-linux-7bf76f0169538279b78536393639859eeb7d93f1.tar.gz kernel-qcow2-linux-7bf76f0169538279b78536393639859eeb7d93f1.tar.xz kernel-qcow2-linux-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 'drivers/s390/block/dasd_erp.c')
| -rw-r--r-- | drivers/s390/block/dasd_erp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c index 9e3419124264..6389feb2fb7a 100644 --- a/drivers/s390/block/dasd_erp.c +++ b/drivers/s390/block/dasd_erp.c @@ -124,7 +124,7 @@ dasd_default_erp_action(struct dasd_ccw_req *cqr) struct dasd_ccw_req *dasd_default_erp_postaction(struct dasd_ccw_req *cqr) { int success; - unsigned long long startclk, stopclk; + unsigned long startclk, stopclk; struct dasd_device *startdev; BUG_ON(cqr->refers == NULL || cqr->function == NULL); |