--- linux-pchubb/drivers/scsi/sd.c	Thu Dec 12 10:58:29 2002
+++ linux/drivers/scsi/sd.c	Thu Dec 12 10:58:29 2002
@@ -1002,8 +1002,8 @@
 			 */
 			int m;
 			unsigned hard_sector = sector_size;
-			sector_t sz = rscsi_disks[i].capacity * (hard_sector/256);
-			sector_t mb = sz >>= 1;
+			sector_t sz = ((sector_t) rscsi_disks[i].capacity) * ((sector_t) (hard_sector/256));
+			sector_t mb = sz >> 1;
 			sector_div(sz, 1250);
 			mb -= sz - 974;
 			
@@ -1015,9 +1015,9 @@
 			}
 
 			printk("SCSI device %s: "
-			       "%u %u-byte hdwr sectors (%u MB)\n",
+			       "%u %u-byte hdwr sectors (%llu MB)\n",
 			       nbuff, rscsi_disks[i].capacity,
-			       hard_sector, sz);
+			       hard_sector, mb);
 		}
 
 		/* Rescale capacity to 512-byte units */