diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 17:11:46 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 17:11:46 +0100 |
commit | bac2f668864eca45b702ee394bef4c5f3a86658c (patch) | |
tree | 9b82100e2f447ae2b3b20f4a935b8020c885adcf /drivers/s390/cio/idset.c | |
parent | cff9f37a1e7b2565f254b5ab40c3213cc0f823a1 (diff) | |
parent | 632506a21a3b5f0596e89d55cda6b482bec331a3 (diff) |
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX dt updates for 3.8
* tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6:
Add device tree file for the armadeus apf27
ARM i.MX: Add Ka-Ro TX25 devicetree
ARM i.MX25: Add devicetree
ARM i.MX25: Add devicetree support
ARM i.MX25: Add missing clock gates
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 199bc679117..65d13e38803 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); } |