Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / lib / bitmap.c

diff --git a/lib/bitmap.c b/lib/bitmap.c
index 5b476d8414be43cc449fe27e3ecac7f2c047ceec..730969c681cbaf6228e5f8a78bd56e3e547b7122 100644 (file)
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -65,12 +65,9 @@ EXPORT_SYMBOL(__bitmap_equal);
 
 void __bitmap_complement(unsigned long *dst, const unsigned long *src, unsigned int bits)
 {
-       unsigned int k, lim = bits/BITS_PER_LONG;
+       unsigned int k, lim = BITS_TO_LONGS(bits);
        for (k = 0; k < lim; ++k)
                dst[k] = ~src[k];
-
-       if (bits % BITS_PER_LONG)
-               dst[k] = ~src[k];
 }
 EXPORT_SYMBOL(__bitmap_complement);