commit 03768b363cdfbc976ab92a07d70e46b8cd597276
author JP Abgrall <jpa@google.com> Fri Apr 27 11:49:16 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 27 11:49:16 2012 -0700
tree 4644f119d76dfbf9d13e68ea0aa7a7243c2b6ce0
parent cf41769375f34dbf17de52df02e4881ecfee0c8b
parent b982bce73b7e2c824ffb50115ea382fe45c751a4

am b982bce7: Revert "libsysutils: NetlinkEvent: add support for interface xt_IDLETIMER events."

* commit 'b982bce73b7e2c824ffb50115ea382fe45c751a4':
  Revert "libsysutils: NetlinkEvent: add support for interface xt_IDLETIMER events."

init/builtins.c

diff --git a/init/builtins.c b/init/builtins.c
index 0b9c0cf..661c9b1 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -330,6 +330,7 @@
     unsigned flag;
 } mount_flags[] = {
     { "noatime",    MS_NOATIME },
+    { "noexec",     MS_NOEXEC },
     { "nosuid",     MS_NOSUID },
     { "nodev",      MS_NODEV },
     { "nodiratime", MS_NODIRATIME },

libpixelflinger/fixed.cpp

diff --git a/libpixelflinger/fixed.cpp b/libpixelflinger/fixed.cpp
index 5b92062..5094537 100644
--- a/libpixelflinger/fixed.cpp
+++ b/libpixelflinger/fixed.cpp
@@ -62,7 +62,8 @@
     int shift;
     x = gglRecipQNormalized(x, &shift);
     shift += 16-q;
-    x += 1L << (shift-1);   // rounding
+    if (shift > 0)
+        x += 1L << (shift-1);   // rounding
     x >>= shift;
     return x;
 }