From db979699b8a71b736483bf1028bf33be56c1d6ca Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Tue, 6 Nov 2012 15:10:05 +0100
Subject: [PATCH] --- yaml --- r: 335490 b: refs/heads/master c:
 7f0bc6c0d45497a0191e99426785954bcbda3c6c h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/s390/cio/idset.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f9cf98300704..e01add0a4ac3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99e639b791f5cfae0b8d42f5fe6c1e8839932bea
+refs/heads/master: 7f0bc6c0d45497a0191e99426785954bcbda3c6c
diff --git a/trunk/drivers/s390/cio/idset.c b/trunk/drivers/s390/cio/idset.c
index 199bc6791177..65d13e38803f 100644
--- a/trunk/drivers/s390/cio/idset.c
+++ b/trunk/drivers/s390/cio/idset.c
@@ -125,8 +125,7 @@ int idset_is_empty(struct idset *set)
 
 void idset_add_set(struct idset *to, struct idset *from)
 {
-	int len = min(__BITOPS_WORDS(to->num_ssid * to->num_id),
-		      __BITOPS_WORDS(from->num_ssid * from->num_id));
+	int len = min(to->num_ssid * to->num_id, from->num_ssid * from->num_id);
 
 	bitmap_or(to->bitmap, to->bitmap, from->bitmap, len);
 }