2 files changed, 3 insertions, 19 deletions

diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c
index 734b121a0554..491e6032bdec 100644
--- a/drivers/ieee1394/highlevel.c
+++ b/drivers/ieee1394/highlevel.c
@@ -306,8 +306,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,
         u64 align_mask = ~(alignment - 1);
 
         if ((alignment & 3) || (alignment > 0x800000000000ULL) ||
-            ((hweight32(alignment >> 32) +
-              hweight32(alignment & 0xffffffff) != 1))) {
+            (hweight64(alignment) != 1)) {
                 HPSB_ERR("%s called with invalid alignment: 0x%048llx",
                          __FUNCTION__, (unsigned long long)alignment);
                 return retval;
diff --git a/lib/bitmap.c b/lib/bitmap.c
index 8acab0e176ef..ed2ae3b0cd06 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -253,33 +253,18 @@ int __bitmap_subset(const unsigned long *bitmap1,
 }
 EXPORT_SYMBOL(__bitmap_subset);
 
-#if BITS_PER_LONG == 32
 int __bitmap_weight(const unsigned long *bitmap, int bits)
 {
         int k, w = 0, lim = bits/BITS_PER_LONG;
 
         for (k = 0; k < lim; k++)
-                w += hweight32(bitmap[k]);
+                w += hweight_long(bitmap[k]);
 
         if (bits % BITS_PER_LONG)
-                w += hweight32(bitmap[k] & BITMAP_LAST_WORD_MASK(bits));
+                w += hweight_long(bitmap[k] & BITMAP_LAST_WORD_MASK(bits));
 
         return w;
 }
-#else
-int __bitmap_weight(const unsigned long *bitmap, int bits)
-{
-        int k, w = 0, lim = bits/BITS_PER_LONG;
-
-        for (k = 0; k < lim; k++)
-                w += hweight64(bitmap[k]);
-
-        if (bits % BITS_PER_LONG)
-                w += hweight64(bitmap[k] & BITMAP_LAST_WORD_MASK(bits));
-
-        return w;
-}
-#endif
 EXPORT_SYMBOL(__bitmap_weight);
 
 /*