Merge tag 'v3.6-rc7' into next

Linux 3.6-rc7

Requested by David Howells so he can merge his key susbsystem work into
my tree with requisite -linus changesets.

1 files changed, 2 insertions, 8 deletions

diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
index 01d3b44b62c1..b4c29848b49d 100644
--- a/security/yama/yama_lsm.c
+++ b/security/yama/yama_lsm.c
@@ -279,12 +279,9 @@ int yama_ptrace_access_check(struct task_struct *child,
         }
 
         if (rc) {
-                char name[sizeof(current->comm)];
                 printk_ratelimited(KERN_NOTICE
                         "ptrace of pid %d was attempted by: %s (pid %d)\n",
-                        child->pid,
-                        get_task_comm(name, current),
-                        current->pid);
+                        child->pid, current->comm, current->pid);
         }
 
         return rc;
@@ -319,12 +316,9 @@ int yama_ptrace_traceme(struct task_struct *parent)
         }
 
         if (rc) {
-                char name[sizeof(current->comm)];
                 printk_ratelimited(KERN_NOTICE
                         "ptraceme of pid %d was attempted by: %s (pid %d)\n",
-                        current->pid,
-                        get_task_comm(name, parent),
-                        parent->pid);
+                        current->pid, parent->comm, parent->pid);
         }
 
         return rc;