From: Todd Poynor <toddpoynor@google.com>
Date: Mon, 30 Apr 2012 22:36:56 +0000 (-0700)
Subject: Merge commit 'v3.0.30' into android-3.0
X-Git-Tag: firefly_0821_release~7613^2~118
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5c15664a86e18352ccdc2f501907725caa9ab73d;p=firefly-linux-kernel-4.4.55.git

Merge commit 'v3.0.30' into android-3.0
---

5c15664a86e18352ccdc2f501907725caa9ab73d
diff --cc security/commoncap.c
index 1322b6aa648d,44f096920cd1..ccfe568b396f
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@@ -28,11 -28,8 +28,12 @@@
  #include <linux/prctl.h>
  #include <linux/securebits.h>
  #include <linux/user_namespace.h>
+ #include <linux/personality.h>
  
 +#ifdef CONFIG_ANDROID_PARANOID_NETWORK
 +#include <linux/android_aid.h>
 +#endif
 +
  /*
   * If a non-root user executes a setuid-root binary in
   * !secure(SECURE_NOROOT) mode, then we raise capabilities.