commit a4d79d68acb872169f2d2a1fa39032184692c6e4
author Geremy Condra <gcondra@google.com> Sat Mar 23 03:59:27 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Mar 23 03:59:27 2013 +0000
tree 52c98bdbda2d18addf7936680fde71ec88ce4a51
parent 504d2747bdc5f987159f707753c15137b8cae7ef
parent 746cde9a8c92a138f7a53b17728ecff5c48c9e4b

am 746cde9a: am fb39c0d1: am 4d71493e: am e849970c: Merge "Fix mode on /data/security."

* commit '746cde9a8c92a138f7a53b17728ecff5c48c9e4b':
  Fix mode on /data/security.

include/cutils/bitops.h

diff --git a/include/cutils/bitops.h b/include/cutils/bitops.h
index eb44236..c26dc54 100644
--- a/include/cutils/bitops.h
+++ b/include/cutils/bitops.h
@@ -75,6 +75,16 @@
     return -1;
 }
 
+static inline int bitmask_weight(unsigned int *bitmask, int num_bits)
+{
+    int i;
+    int weight = 0;
+
+    for (i = 0; i < BITS_TO_WORDS(num_bits); i++)
+        weight += __builtin_popcount(bitmask[i]);
+    return weight;
+}
+
 static inline void bitmask_set(unsigned int *bitmask, int bit)
 {
     bitmask[BIT_WORD(bit)] |= BIT_MASK(bit);