Skip to contentSkip to conversation

fix a warning on kernel/trace/trace_branch.c

PATCH Superseded Zhenwen Xu 3 participants 4 messages Oct 7, 2009 Tracing

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Zhenwen Xu

author
#0 lore raw

PATCH 1/1 fix a warning on kernel/trace/trace_branch.c

fix this warning:

kernel/trace/trace_branch.c: In function ‘probe_likely_condition’:
kernel/trace/trace_branch.c:58: warning: passing argument 1 of ‘ trace_buffer_lock_reserve’ from incompatible pointer type

The "tr" should be "(struct buffer *)tr" or "tr->buffer" here!!!

---
 kernel/trace/trace_branch.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace_branch.c +1 -1
index 7a7a9fd..216e2dd 100644
@@ -54,7 +54,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
 		goto out;
 
 	pc = preempt_count();
-	event = trace_buffer_lock_reserve(tr, TRACE_BRANCH,
+	event = trace_buffer_lock_reserve(tr->buffer, TRACE_BRANCH,
 					  sizeof(*entry), flags, pc);
 	if (!event)
 		goto out;
Signature · 5 lines
1.6.3.3

-- 
--------------------------------
http://zhwen.org - Open and Free
#1 lore raw
Quoted 8 lines · Zhenwen Xu

fix this warning:

kernel/trace/trace_branch.c: In function ‘probe_likely_condition’:
kernel/trace/trace_branch.c:58: warning: passing argument 1 of ‘ trace_buffer_lock_reserve’ from incompatible pointer type

The "tr" should be "(struct buffer *)tr" or "tr->buffer" here!!!

It's caused by the API change of trace_buffer_lock_reserve() by commit e77405ad80f53966524b5c31244e13fbbbecbd84.

Could you send an updated patch to also fix the same bug in kernel/trace/trace_hw_branch.c ?

Quoted 18 lines
---
 kernel/trace/trace_branch.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace_branch.c +1 -1
index 7a7a9fd..216e2dd 100644
@@ -54,7 +54,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
 		goto out;
 
 	pc = preempt_count();
-	event = trace_buffer_lock_reserve(tr, TRACE_BRANCH,
+	event = trace_buffer_lock_reserve(tr->buffer, TRACE_BRANCH,
 					  sizeof(*entry), flags, pc);
 	if (!event)
 		goto out;
author
#2 lore raw
Quoted 12 lines · Li Zefan
Quoted 9 lines · Zhenwen Xu

fix this warning:

kernel/trace/trace_branch.c: In function ‘probe_likely_condition’:
kernel/trace/trace_branch.c:58: warning: passing argument 1 of ‘ trace_buffer_lock_reserve’ from incompatible pointer type

The "tr" should be "(struct buffer *)tr" or "tr->buffer" here!!!

Quoted 6 lines

It's caused by the API change of trace_buffer_lock_reserve() by commit e77405ad80f53966524b5c31244e13fbbbecbd84.

Could you send an updated patch to also fix the same bug in kernel/trace/trace_hw_branch.c ?

Roger that!

Quoted 23 lines
Quoted 20 lines
---
 kernel/trace/trace_branch.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace_branch.c +1 -1
index 7a7a9fd..216e2dd 100644
@@ -54,7 +54,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
 		goto out;
 
 	pc = preempt_count();
-	event = trace_buffer_lock_reserve(tr, TRACE_BRANCH,
+	event = trace_buffer_lock_reserve(tr->buffer, TRACE_BRANCH,
 					  sizeof(*entry), flags, pc);
 	if (!event)
 		goto out;
Signature · 3 lines
---------------------------------
Zhenwen Xu - Open and Free
Home Page:	http://zhwen.org
maintainer
#3 lore raw
Quoted 13 lines · Helight.Xu
Quoted 12 lines · Li Zefan
Quoted 9 lines · Zhenwen Xu

fix this warning:

kernel/trace/trace_branch.c: In function ‘probe_likely_condition’:
kernel/trace/trace_branch.c:58: warning: passing argument 1 of ‘ trace_buffer_lock_reserve’ from incompatible pointer type

The "tr" should be "(struct buffer *)tr" or "tr->buffer" here!!!

Quoted 7 lines
Quoted 6 lines

It's caused by the API change of trace_buffer_lock_reserve() by commit e77405ad80f53966524b5c31244e13fbbbecbd84.

Could you send an updated patch to also fix the same bug in kernel/trace/trace_hw_branch.c ?

Roger that!

Thanks!

I'll pull in this fix now. You can just send a separate patch with the other fix.

-- Steve

Quoted 25 lines
Quoted 23 lines
Quoted 20 lines
---
 kernel/trace/trace_branch.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace_branch.c +1 -1
index 7a7a9fd..216e2dd 100644
@@ -54,7 +54,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
 		goto out;
 
 	pc = preempt_count();
-	event = trace_buffer_lock_reserve(tr, TRACE_BRANCH,
+	event = trace_buffer_lock_reserve(tr->buffer, TRACE_BRANCH,
 					  sizeof(*entry), flags, pc);
 	if (!event)
 		goto out;