diff options
| author |   Sebastian Ott <sebott@linux.vnet.ibm.com> | 2012-11-06 15:10:05 +0100 |
|---|---|---|
| committer |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-11-06 22:39:54 +0100 |
| commit | 7f0bc6c0d45497a0191e99426785954bcbda3c6c (patch) | |
| tree | 3f83b9970a965fc93e50c885fc44840b28402022 /drivers/s390/cio/idset.c | |
| parent | s390/sclp: fix addressing mode clobber (diff) | |
| download | linux-dev-7f0bc6c0d45497a0191e99426785954bcbda3c6c.tar.xz linux-dev-7f0bc6c0d45497a0191e99426785954bcbda3c6c.zip | |
s390/cio: fix length calculation in idset.c
bitmap_or uses the number of bits as its length parameter and
not the number of words necessary to store those bits.
This fixes a regression introduced by:
aa92b33 s390/cio: use generic bitmap functions
Reported-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
Acked-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
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); } |