aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2003-04-29 18:45:45 +0000
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2003-04-29 18:45:45 +0000
commit0120669510d656dd21dc1fc5b133385aa4870fd5 (patch)
tree6c200610c4af4616d6a850c3b0d3156b9ef64970
parent4ecf7e405c95eaee7a955e617cc6daf0725cbff5 (diff)
downloadxen-0120669510d656dd21dc1fc5b133385aa4870fd5.tar.gz
xen-0120669510d656dd21dc1fc5b133385aa4870fd5.tar.bz2
xen-0120669510d656dd21dc1fc5b133385aa4870fd5.zip
bitkeeper revision 1.195 (3eaec8596pxD7fZFaOTkio2qijGk9g)
xl_ide.c: Small Xenolinux IDE fix.
-rw-r--r--xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_ide.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_ide.c b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_ide.c
index 1a78cc5562..f82ce4fe94 100644
--- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_ide.c
+++ b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_ide.c
@@ -45,9 +45,9 @@ static struct gendisk *setup_major(xen_disk_info_t *xdi, int base, int major)
struct gendisk *gd;
blk_size[major] = NULL;
- blksize_size[major] = xlide_blksize_size + base*XLIDE_DEVS_PER_MAJOR;
- hardsect_size[major] = xlide_hardsect_size + base*XLIDE_DEVS_PER_MAJOR;
- max_sectors[major] = xlide_max_sectors + base*XLIDE_DEVS_PER_MAJOR;
+ blksize_size[major] = xlide_blksize_size + base*(1<<XLIDE_PARTN_SHIFT);
+ hardsect_size[major] = xlide_hardsect_size + base*(1<<XLIDE_PARTN_SHIFT);
+ max_sectors[major] = xlide_max_sectors + base*(1<<XLIDE_PARTN_SHIFT);
read_ahead[major] = 8;
blk_init_queue(BLK_DEFAULT_QUEUE(major), do_xlblk_request);
@@ -134,7 +134,7 @@ int xlide_init(xen_disk_info_t *xdi)
for ( i = 0; i < xdi->count; i++ )
if ( IS_IDE_XENDEV(xdi->disks[i].device) &&
((xdi->disks[i].device & XENDEV_IDX_MASK) <
- XLIDE_DEVS_PER_MAJOR) )
+ (2*XLIDE_DEVS_PER_MAJOR)) )
units++;
if ( units == 0 ) return 0;