From b2c86ed3ba002a68cf7cd24d97cabba8c30af5d3 Mon Sep 17 00:00:00 2001 From: Stefan Weinhuber Date: Fri, 12 Jun 2009 10:26:36 +0200 Subject: [PATCH] --- yaml --- r: 148769 b: refs/heads/master c: 45b44d76d373e66d08e0c745dc82ff9123103588 h: refs/heads/master i: 148767: 7fafd312aa0aa7ba1f1644e574d3a21dd4622b7b v: v3 --- [refs] | 2 +- trunk/drivers/s390/block/dasd_eckd.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 165259c2c6b9..5eeac8ecef1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0591485e15ccd908f91058f7da134248dcdbbb3 +refs/heads/master: 45b44d76d373e66d08e0c745dc82ff9123103588 diff --git a/trunk/drivers/s390/block/dasd_eckd.c b/trunk/drivers/s390/block/dasd_eckd.c index a41c94053e64..81f8819eaf19 100644 --- a/trunk/drivers/s390/block/dasd_eckd.c +++ b/trunk/drivers/s390/block/dasd_eckd.c @@ -2336,9 +2336,10 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev, { int tpm, cmdrtd, cmdwtd; int use_prefix; - - struct dasd_eckd_private *private; +#if defined(CONFIG_64BIT) int fcx_in_css, fcx_in_gneq, fcx_in_features; +#endif + struct dasd_eckd_private *private; struct dasd_device *basedev; sector_t first_rec, last_rec; sector_t first_trk, last_trk; @@ -2361,11 +2362,15 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev, last_offs = sector_div(last_trk, blk_per_trk); cdlspecial = (private->uses_cdl && first_rec < 2*blk_per_trk); - /* is transport mode supported ? */ + /* is transport mode supported? */ +#if defined(CONFIG_64BIT) fcx_in_css = css_general_characteristics.fcx; fcx_in_gneq = private->gneq->reserved2[7] & 0x04; fcx_in_features = private->features.feature[40] & 0x80; tpm = fcx_in_css && fcx_in_gneq && fcx_in_features; +#else + tpm = 0; +#endif /* is read track data and write track data in command mode supported? */ cmdrtd = private->features.feature[9] & 0x20;