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>
This commit is contained in:
parent
e1108e8f0d
commit
7bf76f0169
|
@ -176,7 +176,7 @@ static inline cycles_t get_cycles(void)
|
||||||
return (cycles_t) get_tod_clock() >> 2;
|
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);
|
void init_cpu_timer(void);
|
||||||
unsigned long long monotonic_clock(void);
|
unsigned long long monotonic_clock(void);
|
||||||
|
|
||||||
|
|
|
@ -357,7 +357,7 @@ static unsigned long clock_sync_flags;
|
||||||
* source. If the clock mode is local it will return -EOPNOTSUPP and
|
* source. If the clock mode is local it will return -EOPNOTSUPP and
|
||||||
* -EAGAIN if the clock is not in sync with the external reference.
|
* -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;
|
atomic_t *sw_ptr;
|
||||||
unsigned int sw0, sw1;
|
unsigned int sw0, sw1;
|
||||||
|
|
|
@ -1665,7 +1665,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
|
||||||
{
|
{
|
||||||
struct dasd_ccw_req *cqr, *next;
|
struct dasd_ccw_req *cqr, *next;
|
||||||
struct dasd_device *device;
|
struct dasd_device *device;
|
||||||
unsigned long long now;
|
unsigned long now;
|
||||||
int nrf_suppressed = 0;
|
int nrf_suppressed = 0;
|
||||||
int fp_suppressed = 0;
|
int fp_suppressed = 0;
|
||||||
u8 *sense = NULL;
|
u8 *sense = NULL;
|
||||||
|
|
|
@ -2231,7 +2231,7 @@ static void dasd_3990_erp_account_error(struct dasd_ccw_req *erp)
|
||||||
struct dasd_device *device = erp->startdev;
|
struct dasd_device *device = erp->startdev;
|
||||||
__u8 lpum = erp->refers->irb.esw.esw1.lpum;
|
__u8 lpum = erp->refers->irb.esw.esw1.lpum;
|
||||||
int pos = pathmask_to_pos(lpum);
|
int pos = pathmask_to_pos(lpum);
|
||||||
unsigned long long clk;
|
unsigned long clk;
|
||||||
|
|
||||||
if (!device->path_thrhld)
|
if (!device->path_thrhld)
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -235,7 +235,7 @@ static void dasd_ext_handler(struct ext_code ext_code,
|
||||||
{
|
{
|
||||||
struct dasd_ccw_req *cqr, *next;
|
struct dasd_ccw_req *cqr, *next;
|
||||||
struct dasd_device *device;
|
struct dasd_device *device;
|
||||||
unsigned long long expires;
|
unsigned long expires;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
addr_t ip;
|
addr_t ip;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
|
@ -3254,11 +3254,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track(
|
||||||
/* 1x prefix + one read/write ccw per track */
|
/* 1x prefix + one read/write ccw per track */
|
||||||
cplength = 1 + trkcount;
|
cplength = 1 + trkcount;
|
||||||
|
|
||||||
/* on 31-bit we need space for two 32 bit addresses per page
|
datasize = sizeof(struct PFX_eckd_data) + cidaw * sizeof(unsigned long);
|
||||||
* on 64-bit one 64 bit address
|
|
||||||
*/
|
|
||||||
datasize = sizeof(struct PFX_eckd_data) +
|
|
||||||
cidaw * sizeof(unsigned long long);
|
|
||||||
|
|
||||||
/* Allocate the ccw request. */
|
/* Allocate the ccw request. */
|
||||||
cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize,
|
cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize,
|
||||||
|
@ -3856,7 +3852,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_raw(struct dasd_device *startdev,
|
||||||
}
|
}
|
||||||
size = ALIGN(size, 8);
|
size = ALIGN(size, 8);
|
||||||
|
|
||||||
datasize = size + cidaw * sizeof(unsigned long long);
|
datasize = size + cidaw * sizeof(unsigned long);
|
||||||
|
|
||||||
/* Allocate the ccw request. */
|
/* Allocate the ccw request. */
|
||||||
cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength,
|
cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength,
|
||||||
|
|
|
@ -165,7 +165,7 @@ struct DE_eckd_data {
|
||||||
__u8 ga_extended; /* Global Attributes Extended */
|
__u8 ga_extended; /* Global Attributes Extended */
|
||||||
struct ch_t beg_ext;
|
struct ch_t beg_ext;
|
||||||
struct ch_t end_ext;
|
struct ch_t end_ext;
|
||||||
unsigned long long ep_sys_time; /* Ext Parameter - System Time Stamp */
|
unsigned long ep_sys_time; /* Ext Parameter - System Time Stamp */
|
||||||
__u8 ep_format; /* Extended Parameter format byte */
|
__u8 ep_format; /* Extended Parameter format byte */
|
||||||
__u8 ep_prio; /* Extended Parameter priority I/O byte */
|
__u8 ep_prio; /* Extended Parameter priority I/O byte */
|
||||||
__u8 ep_reserved1; /* Extended Parameter Reserved */
|
__u8 ep_reserved1; /* Extended Parameter Reserved */
|
||||||
|
|
|
@ -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)
|
struct dasd_ccw_req *dasd_default_erp_postaction(struct dasd_ccw_req *cqr)
|
||||||
{
|
{
|
||||||
int success;
|
int success;
|
||||||
unsigned long long startclk, stopclk;
|
unsigned long startclk, stopclk;
|
||||||
struct dasd_device *startdev;
|
struct dasd_device *startdev;
|
||||||
|
|
||||||
BUG_ON(cqr->refers == NULL || cqr->function == NULL);
|
BUG_ON(cqr->refers == NULL || cqr->function == NULL);
|
||||||
|
|
|
@ -196,10 +196,10 @@ struct dasd_ccw_req {
|
||||||
void *function; /* originating ERP action */
|
void *function; /* originating ERP action */
|
||||||
|
|
||||||
/* these are for statistics only */
|
/* these are for statistics only */
|
||||||
unsigned long long buildclk; /* TOD-clock of request generation */
|
unsigned long buildclk; /* TOD-clock of request generation */
|
||||||
unsigned long long startclk; /* TOD-clock of request start */
|
unsigned long startclk; /* TOD-clock of request start */
|
||||||
unsigned long long stopclk; /* TOD-clock of request interrupt */
|
unsigned long stopclk; /* TOD-clock of request interrupt */
|
||||||
unsigned long long endclk; /* TOD-clock of request termination */
|
unsigned long endclk; /* TOD-clock of request termination */
|
||||||
|
|
||||||
/* Callback that is called after reaching final status. */
|
/* Callback that is called after reaching final status. */
|
||||||
void (*callback)(struct dasd_ccw_req *, void *data);
|
void (*callback)(struct dasd_ccw_req *, void *data);
|
||||||
|
@ -423,7 +423,7 @@ struct dasd_path {
|
||||||
u8 chpid;
|
u8 chpid;
|
||||||
struct dasd_conf_data *conf_data;
|
struct dasd_conf_data *conf_data;
|
||||||
atomic_t error_count;
|
atomic_t error_count;
|
||||||
unsigned long long errorclk;
|
unsigned long errorclk;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -539,7 +539,7 @@ struct dasd_block {
|
||||||
struct block_device *bdev;
|
struct block_device *bdev;
|
||||||
atomic_t open_count;
|
atomic_t open_count;
|
||||||
|
|
||||||
unsigned long long blocks; /* size of volume in blocks */
|
unsigned long blocks; /* size of volume in blocks */
|
||||||
unsigned int bp_block; /* bytes per block */
|
unsigned int bp_block; /* bytes per block */
|
||||||
unsigned int s2b_shift; /* log2 (bp_block/512) */
|
unsigned int s2b_shift; /* log2 (bp_block/512) */
|
||||||
|
|
||||||
|
|
|
@ -90,7 +90,7 @@ dasd_devices_show(struct seq_file *m, void *v)
|
||||||
seq_printf(m, "n/f ");
|
seq_printf(m, "n/f ");
|
||||||
else
|
else
|
||||||
seq_printf(m,
|
seq_printf(m,
|
||||||
"at blocksize: %d, %lld blocks, %lld MB",
|
"at blocksize: %u, %lu blocks, %lu MB",
|
||||||
block->bp_block, block->blocks,
|
block->bp_block, block->blocks,
|
||||||
((block->bp_block >> 9) *
|
((block->bp_block >> 9) *
|
||||||
block->blocks) >> 11);
|
block->blocks) >> 11);
|
||||||
|
|
Loading…
Reference in New Issue