diff options
| author | Huang Shijie <shijie.huang@arm.com> | 2016-05-20 20:04:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-20 20:58:30 -0400 |
| commit | 603ac5df86df5bfd26ed4d9c310dd196b07590ae (patch) | |
| tree | 6c2b1a1181c1d8d603bc499e1a10677b27db1805 /samples | |
| parent | c8cdd2be213f0f5372287a764225665f1ac64e56 (diff) | |
kprobes: add the "tls" argument for j_do_fork
Commit 3033f14ab78c ("clone: support passing tls argument via C rather
than pt_regs magic") added the tls argument for _do_fork(). This patch
adds the "tls" argument for j_do_fork to make it match _do_fork().
Signed-off-by: Huang Shijie <shijie.huang@arm.com>
Acked-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/kprobes/jprobe_example.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/kprobes/jprobe_example.c b/samples/kprobes/jprobe_example.c index c285a3b8a9f1..c3108bb15789 100644 --- a/samples/kprobes/jprobe_example.c +++ b/samples/kprobes/jprobe_example.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | /* Proxy routine having the same arguments as actual _do_fork() routine */ | 25 | /* Proxy routine having the same arguments as actual _do_fork() routine */ |
| 26 | static long j_do_fork(unsigned long clone_flags, unsigned long stack_start, | 26 | static long j_do_fork(unsigned long clone_flags, unsigned long stack_start, |
| 27 | unsigned long stack_size, int __user *parent_tidptr, | 27 | unsigned long stack_size, int __user *parent_tidptr, |
| 28 | int __user *child_tidptr) | 28 | int __user *child_tidptr, unsigned long tls) |
| 29 | { | 29 | { |
| 30 | pr_info("jprobe: clone_flags = 0x%lx, stack_start = 0x%lx " | 30 | pr_info("jprobe: clone_flags = 0x%lx, stack_start = 0x%lx " |
| 31 | "stack_size = 0x%lx\n", clone_flags, stack_start, stack_size); | 31 | "stack_size = 0x%lx\n", clone_flags, stack_start, stack_size); |
