mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Linux 3.6-rc7
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQX7MuAAoJEHm+PkMAQRiG0h0IAJURkrMCAQUxA+Ik66ReH89s LQcVd0U9uL4UUOi7f5WR64Vf9Cfu6VVGX9ZKSvjpNskvlQaUQPMIt4pMe6g4X4dI u0bApEy4XZz3nGabUAghIU8jJ8cDmhCG6kPpSiS7pi7KHc0yIa4WFtJRrIpGaIWT xuK38YOiOHcSDRlLyWZzainMncQp/ixJdxnqVMTonkVLk0q0b84XzOr4/qlLE5lU i+TsK3PRKdQXgvZ4CebL+srPBwWX1dmgP3VkeBloQbSSenSeELICbFWavn2ml+sF GXi4dO93oNquL/Oy5SwI666T4uNcrRPaS+5X+xSZgBW/y2aQVJVJuNZg6ZP/uWk= =0v2l -----END PGP SIGNATURE----- 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.
This commit is contained in:
commit
bf53083445
1226 changed files with 12337 additions and 7967 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue