Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bf76f01 authored by Jan Höppner's avatar Jan Höppner Committed by Martin Schwidefsky
Browse files

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarJan Höppner <hoeppner@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent e1108e8f

arch/s390/include/asm/timex.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static inline cycles_t get_cycles(void) 
	return (cycles_t) get_tod_clock() >> 2;

}



int get_phys_clock(unsigned long long *clock);

int get_phys_clock(unsigned long *clock);

void init_cpu_timer(void);

unsigned long long monotonic_clock(void);

arch/s390/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/s390/block/dasd.c

+1 −1
Original line number Diff line number Diff line
@@ -1665,7 +1665,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, 
{

	struct dasd_ccw_req *cqr, *next;

	struct dasd_device *device;

	unsigned long long now;

	unsigned long now;

	int nrf_suppressed = 0;

	int fp_suppressed = 0;

	u8 *sense = NULL;

drivers/s390/block/dasd_3990_erp.c

+1 −1
Original line number Diff line number Diff line
@@ -2231,7 +2231,7 @@ static void dasd_3990_erp_account_error(struct dasd_ccw_req *erp) 
	struct dasd_device *device = erp->startdev;

	__u8 lpum = erp->refers->irb.esw.esw1.lpum;

	int pos = pathmask_to_pos(lpum);

	unsigned long long clk;

	unsigned long clk;



	if (!device->path_thrhld)

		return;

drivers/s390/block/dasd_diag.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static void dasd_ext_handler(struct ext_code ext_code, 
{

	struct dasd_ccw_req *cqr, *next;

	struct dasd_device *device;

	unsigned long long expires;

	unsigned long expires;

	unsigned long flags;

	addr_t ip;

	int rc;