projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'trace-4.1-tracefs' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...
[linux-2.6-block.git]
/
kernel
/
trace
/
trace_kprobe.c
diff --git
a/kernel/trace/trace_kprobe.c
b/kernel/trace/trace_kprobe.c
index c1c6655847c8a4af01eda670dd51c9170be72bac..ed998fbf09ced408c5fe003430a00ea2430b5fa6 100644
(file)
--- a/
kernel/trace/trace_kprobe.c
+++ b/
kernel/trace/trace_kprobe.c
@@
-1148,7
+1148,7
@@
kprobe_perf_func(struct trace_kprobe *tk, struct pt_regs *regs)
size = ALIGN(__size + sizeof(u32), sizeof(u64));
size -= sizeof(u32);
size = ALIGN(__size + sizeof(u32), sizeof(u64));
size -= sizeof(u32);
- entry = perf_trace_buf_prepare(size, call->event.type,
regs
, &rctx);
+ entry = perf_trace_buf_prepare(size, call->event.type,
NULL
, &rctx);
if (!entry)
return;
if (!entry)
return;
@@
-1179,7
+1179,7
@@
kretprobe_perf_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
size = ALIGN(__size + sizeof(u32), sizeof(u64));
size -= sizeof(u32);
size = ALIGN(__size + sizeof(u32), sizeof(u64));
size -= sizeof(u32);
- entry = perf_trace_buf_prepare(size, call->event.type,
regs
, &rctx);
+ entry = perf_trace_buf_prepare(size, call->event.type,
NULL
, &rctx);
if (!entry)
return;
if (!entry)
return;