Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

2 files changed, 3 insertions, 4 deletions

diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 12e4fb72bf..53d6c7bbf5 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -494,8 +494,7 @@ static inline void avc_print_ipv6_addr(struct audit_buffer *ab,
                                        char *name1, char *name2)
 {
         if (!ipv6_addr_any(addr))
-                audit_log_format(ab, " %s=%04x:%04x:%04x:%04x:%04x:"
-                                 "%04x:%04x:%04x", name1, NIP6(*addr));
+                audit_log_format(ab, " %s=" NIP6_FMT, name1, NIP6(*addr));
         if (port)
                 audit_log_format(ab, " %s=%d", name2, ntohs(port));
 }
@@ -504,7 +503,7 @@ static inline void avc_print_ipv4_addr(struct audit_buffer *ab, u32 addr,
                                        __be16 port, char *name1, char *name2)
 {
         if (addr)
-                audit_log_format(ab, " %s=%d.%d.%d.%d", name1, NIPQUAD(addr));
+                audit_log_format(ab, " %s=" NIPQUAD_FMT, name1, NIPQUAD(addr));
         if (port)
                 audit_log_format(ab, " %s=%d", name2, ntohs(port));
 }
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 6647204e46..b9f8d9731c 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1019,7 +1019,7 @@ static inline int dentry_has_perm(struct task_struct *tsk,
    has the same SID as the process.  If av is zero, then
    access to the file is not checked, e.g. for cases
    where only the descriptor is affected like seek. */
-static inline int file_has_perm(struct task_struct *tsk,
+static int file_has_perm(struct task_struct *tsk,
                                 struct file *file,
                                 u32 av)
 {