---

yaml --- r: 335490 b: refs/heads/master c: 7f0bc6c h: refs/heads/master v: v3
git-mirror · Nov 6, 2012 · db97969 · db97969
1 parent ffca874
commit db97969
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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);
 }