diff --git a/[refs] b/[refs]
index 2eb10be19333..8678979da0f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab2b49518e743962f71b94246855c44ee9cf52cc
+refs/heads/master: de45e806a84909648623119dfe6fc1d31e71ceba
diff --git a/trunk/security/commoncap.c b/trunk/security/commoncap.c
index e4c4b3fc0c04..399bfdb9e2da 100644
--- a/trunk/security/commoncap.c
+++ b/trunk/security/commoncap.c
@@ -541,7 +541,7 @@ int cap_task_post_setuid (uid_t old_ruid, uid_t old_euid, uid_t old_suid,
  * yet with increased caps.
  * So we check for increased caps on the target process.
  */
-static inline int cap_safe_nice(struct task_struct *p)
+static int cap_safe_nice(struct task_struct *p)
 {
 	if (!cap_issubset(p->cap_permitted, current->cap_permitted) &&
 	    !capable(CAP_SYS_NICE))