From b7f85a684fcb34f8ded850a09313b4c2e9d763ff Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Tue, 14 Oct 2008 11:34:20 -0700
Subject: [PATCH] --- yaml --- r: 117712 b: refs/heads/master c:
 520a2c2741747062e75f91cd0faddb564fbc64d2 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/scsi/sd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8590c17cfdb8..29e1173d8022 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8659597bf744b0f8d2560e2a734b5c941569e0e
+refs/heads/master: 520a2c2741747062e75f91cd0faddb564fbc64d2
diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c
index 7e22aa7b8b8a..7ba70bef8b5d 100644
--- a/trunk/drivers/scsi/sd.c
+++ b/trunk/drivers/scsi/sd.c
@@ -1436,7 +1436,7 @@ sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer)
 
 	{
 		char cap_str_2[10], cap_str_10[10];
-		u64 sz = sdkp->capacity << ffz(~sector_size);
+		u64 sz = (u64)sdkp->capacity << ilog2(sector_size);
 
 		string_get_size(sz, STRING_UNITS_2, cap_str_2,
 				sizeof(cap_str_2));