Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6-omap-h63xx.git] / security / commoncap.c

diff --git a/security/commoncap.c b/security/commoncap.c
index e4c4b3fc0c04e49e553610a8bd4d433e55e9212a..399bfdb9e2da99c4ef81fdd8b0391b1f5571c371 100644 (file)
--- a/security/commoncap.c
+++ b/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))