commit f798f300f39c9b45e06e18b610cf0f996eea0161
author The Android Open Source Project <initial-contribution@android.com> Tue Mar 26 12:17:45 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 26 12:17:45 2013 -0700
tree 0470fa4f153d85feb5e2a84f3d1d868672f6a6ae
parent 82075a4044efe57ad9bad3d18982e311b4ef53ae
parent 540c9fbaf58593e2d9046efd6a29caff6af0e77b

am 540c9fba: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '540c9fbaf58593e2d9046efd6a29caff6af0e77b':

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);

toolbox/rm.c

diff --git a/toolbox/rm.c b/toolbox/rm.c
index 3a24bec..127cbc4 100644
--- a/toolbox/rm.c
+++ b/toolbox/rm.c
@@ -103,8 +103,8 @@
             ret = unlink_recursive(argv[i], flags);
         } else {
             ret = unlink(argv[i]);
-            if (errno == ENOENT && (flags & OPT_FORCE)) {
-                return 0;
+            if (ret < 0 && errno == ENOENT && (flags & OPT_FORCE)) {
+                continue;
             }
         }