diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 00:00:25 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 00:00:25 -0800 |
commit | 3f6f1cd6ffb473f426858692e8e1cb82aea137eb (patch) | |
tree | d3f3f931d3ed57041dc0feafb8fdbf9843fcb5fc /drivers/s390/cio/idset.c | |
parent | 1443f8a0b95c07cee9df4420a30eea24123af3f3 (diff) | |
parent | b57870e28d27561ea5bad538c22b7d10f531b35c (diff) |
Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards
From Haojian Zhuang:
* 'armsoc/board' of git://github.com/hzhuang1/linux:
ARM: mmp: select pinctrl driver
+ Linux 3.7-rc6
Diffstat (limited to 'drivers/s390/cio/idset.c')
-rw-r--r-- | drivers/s390/cio/idset.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/cio/idset.c b/drivers/s390/cio/idset.c index 199bc6791177..65d13e38803f 100644 --- a/drivers/s390/cio/idset.c +++ b/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); } |