commit 67952e61ad1d9cf7fe8a15da1fcec74241d018e9
author The Android Automerger <android-build@android.com> Wed Sep 26 07:00:29 2012 -0700
committer The Android Automerger <android-build@android.com> Wed Sep 26 07:00:29 2012 -0700
tree 92611f412df88eb8541fed216be796293e15fdd0
parent 00615f017bcc4be5a6ce02f1eeeebe59dbd381df
parent 74b6e3dc0ea7af4cb2478d38e4b81ecbfabaae6c

merge in jb-mr1-release history after reset to jb-mr1-dev

libcutils/fs.c

diff --git a/libcutils/fs.c b/libcutils/fs.c
index a9889b2..1226d44 100644
--- a/libcutils/fs.c
+++ b/libcutils/fs.c
@@ -55,8 +55,10 @@
 
 create:
     if (TEMP_FAILURE_RETRY(mkdir(path, mode)) == -1) {
-        ALOGE("Failed to mkdir(%s): %s", path, strerror(errno));
-        return -1;
+        if (errno != EEXIST) {
+            ALOGE("Failed to mkdir(%s): %s", path, strerror(errno));
+            return -1;
+        }
     }
 
 fixup:

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index d3030e4..619d5c2 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -155,6 +155,9 @@
     chown root log /proc/vmallocinfo
     chmod 0440 /proc/vmallocinfo
 
+    chown root log /proc/slabinfo
+    chmod 0440 /proc/slabinfo
+
     #change permissions on kmsg & sysrq-trigger so bugreports can grab kthread stacks
     chown root system /proc/kmsg
     chmod 0440 /proc/kmsg