[PATCH] perf unwind: Fix a compile error

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH] perf unwind: Fix a compile error
@ 2015-06-16 11:16 Hou Pengyang
  2015-06-16 13:47 ` Arnaldo Carvalho de Melo
  2015-06-18  8:15 ` [tip:perf/core] " tip-bot for Hou Pengyang
  0 siblings, 2 replies; 5+ messages in thread
From: Hou Pengyang @ 2015-06-16 11:16 UTC (permalink / raw)
  To: namhyung, acme; +Cc: mingo, wangnan0, linux-kernel

When libunwind is on, there is a compile error as :

util/unwind-libunwind.c:363:21: error: 'dso' undeclared (first use in this function)
    dso__data_put_fd(dso);

This patch fix it.

Fixes: 4bb11d012ab248d0 ("perf tools: Add dso__data_get/put_fd()")
Signed-off-by: Hou Pengyang <houpengyang@huawei.com>
---
 tools/perf/util/unwind-libunwind.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
index f079b63..4c00507 100644
--- a/tools/perf/util/unwind-libunwind.c
+++ b/tools/perf/util/unwind-libunwind.c
@@ -360,7 +360,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
 		unw_word_t base = is_exec ? 0 : map->start;
 
 		if (fd >= 0)
-			dso__data_put_fd(dso);
+			dso__data_put_fd(map->dso);
 
 		memset(&di, 0, sizeof(di));
 		if (dwarf_find_debug_frame(0, &di, ip, base, map->dso->name,
-- 
1.8.5.2


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] perf unwind: Fix a compile error
  2015-06-16 11:16 [PATCH] perf unwind: Fix a compile error Hou Pengyang
@ 2015-06-16 13:47 ` Arnaldo Carvalho de Melo
  2015-06-17 11:51   ` Wangnan (F)
  2015-06-18  8:15 ` [tip:perf/core] " tip-bot for Hou Pengyang
  1 sibling, 1 reply; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2015-06-16 13:47 UTC (permalink / raw)
  To: Hou Pengyang; +Cc: namhyung, mingo, wangnan0, linux-kernel

Em Tue, Jun 16, 2015 at 11:16:35AM +0000, Hou Pengyang escreveu:
> When libunwind is on, there is a compile error as :
> 
> util/unwind-libunwind.c:363:21: error: 'dso' undeclared (first use in this function)
>     dso__data_put_fd(dso);
> 
> This patch fix it.

Thanks, applied.

- Arnaldo
 
> Fixes: 4bb11d012ab248d0 ("perf tools: Add dso__data_get/put_fd()")
> Signed-off-by: Hou Pengyang <houpengyang@huawei.com>
> ---
>  tools/perf/util/unwind-libunwind.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
> index f079b63..4c00507 100644
> --- a/tools/perf/util/unwind-libunwind.c
> +++ b/tools/perf/util/unwind-libunwind.c
> @@ -360,7 +360,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
>  		unw_word_t base = is_exec ? 0 : map->start;
>  
>  		if (fd >= 0)
> -			dso__data_put_fd(dso);
> +			dso__data_put_fd(map->dso);
>  
>  		memset(&di, 0, sizeof(di));
>  		if (dwarf_find_debug_frame(0, &di, ip, base, map->dso->name,
> -- 
> 1.8.5.2

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] perf unwind: Fix a compile error
  2015-06-16 13:47 ` Arnaldo Carvalho de Melo
@ 2015-06-17 11:51   ` Wangnan (F)
  2015-06-17 19:35     ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 5+ messages in thread
From: Wangnan (F) @ 2015-06-17 11:51 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo, Hou Pengyang; +Cc: namhyung, mingo, linux-kernel



On 2015/6/16 21:47, Arnaldo Carvalho de Melo wrote:
> Em Tue, Jun 16, 2015 at 11:16:35AM +0000, Hou Pengyang escreveu:
>> When libunwind is on, there is a compile error as :
>>
>> util/unwind-libunwind.c:363:21: error: 'dso' undeclared (first use in this function)
>>      dso__data_put_fd(dso);
>>
>> This patch fix it.
> Thanks, applied.
>
> - Arnaldo
>   

I just realized that I posted this patch several weeks ago and has been 
acked. Please see:

  http://lkml.kernel.org/r/CAM9d7cjkjcF_7AeZ0d7kyDLWwjutLpJm-MfdDR42tr=iQYnz6g@mail.gmail.com

I'll reply that post to note others about this one.

Anyway, thank you for fixing this problem.

>> Fixes: 4bb11d012ab248d0 ("perf tools: Add dso__data_get/put_fd()")
>> Signed-off-by: Hou Pengyang <houpengyang@huawei.com>
>> ---
>>   tools/perf/util/unwind-libunwind.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
>> index f079b63..4c00507 100644
>> --- a/tools/perf/util/unwind-libunwind.c
>> +++ b/tools/perf/util/unwind-libunwind.c
>> @@ -360,7 +360,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
>>   		unw_word_t base = is_exec ? 0 : map->start;
>>   
>>   		if (fd >= 0)
>> -			dso__data_put_fd(dso);
>> +			dso__data_put_fd(map->dso);
>>   
>>   		memset(&di, 0, sizeof(di));
>>   		if (dwarf_find_debug_frame(0, &di, ip, base, map->dso->name,
>> -- 
>> 1.8.5.2



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] perf unwind: Fix a compile error
  2015-06-17 11:51   ` Wangnan (F)
@ 2015-06-17 19:35     ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2015-06-17 19:35 UTC (permalink / raw)
  To: Wangnan (F); +Cc: Hou Pengyang, namhyung, mingo, linux-kernel

Em Wed, Jun 17, 2015 at 07:51:37PM +0800, Wangnan (F) escreveu:
> 
> 
> On 2015/6/16 21:47, Arnaldo Carvalho de Melo wrote:
> >Em Tue, Jun 16, 2015 at 11:16:35AM +0000, Hou Pengyang escreveu:
> >>When libunwind is on, there is a compile error as :
> >>
> >>util/unwind-libunwind.c:363:21: error: 'dso' undeclared (first use in this function)
> >>     dso__data_put_fd(dso);
> >>
> >>This patch fix it.
> >Thanks, applied.
> >
> >- Arnaldo
> 
> I just realized that I posted this patch several weeks ago and has been
> acked. Please see:
> 
>  http://lkml.kernel.org/r/CAM9d7cjkjcF_7AeZ0d7kyDLWwjutLpJm-MfdDR42tr=iQYnz6g@mail.gmail.com
> 
> I'll reply that post to note others about this one.
> 
> Anyway, thank you for fixing this problem.

Sorry, some patches sometimes gets lost, I should've applied yours,
sooner, but what matters is that the problem got solved.

Thanks,

- Arnaldo
 
> >>Fixes: 4bb11d012ab248d0 ("perf tools: Add dso__data_get/put_fd()")
> >>Signed-off-by: Hou Pengyang <houpengyang@huawei.com>
> >>---
> >>  tools/perf/util/unwind-libunwind.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >>diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
> >>index f079b63..4c00507 100644
> >>--- a/tools/perf/util/unwind-libunwind.c
> >>+++ b/tools/perf/util/unwind-libunwind.c
> >>@@ -360,7 +360,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
> >>  		unw_word_t base = is_exec ? 0 : map->start;
> >>  		if (fd >= 0)
> >>-			dso__data_put_fd(dso);
> >>+			dso__data_put_fd(map->dso);
> >>  		memset(&di, 0, sizeof(di));
> >>  		if (dwarf_find_debug_frame(0, &di, ip, base, map->dso->name,
> >>-- 
> >>1.8.5.2
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [tip:perf/core] perf unwind: Fix a compile error
  2015-06-16 11:16 [PATCH] perf unwind: Fix a compile error Hou Pengyang
  2015-06-16 13:47 ` Arnaldo Carvalho de Melo
@ 2015-06-18  8:15 ` tip-bot for Hou Pengyang
  1 sibling, 0 replies; 5+ messages in thread
From: tip-bot for Hou Pengyang @ 2015-06-18  8:15 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: tglx, linux-kernel, acme, wangnan0, hpa, mingo, namhyung,
	houpengyang

Commit-ID:  f005813afb89bae92faf254130c544dc68984c6b
Gitweb:     http://git.kernel.org/tip/f005813afb89bae92faf254130c544dc68984c6b
Author:     Hou Pengyang <houpengyang@huawei.com>
AuthorDate: Tue, 16 Jun 2015 11:16:35 +0000
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 16 Jun 2015 10:40:03 -0300

perf unwind: Fix a compile error

When libunwind is on, there is a compile error as :

  util/unwind-libunwind.c:363:21: error: 'dso' undeclared (first use in this function)
      dso__data_put_fd(dso);

This patch fixes it.

Signed-off-by: Hou Pengyang <houpengyang@huawei.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: 4bb11d012ab248d0 ("perf tools: Add dso__data_get/put_fd()")
Link: http://lkml.kernel.org/r/1434453395-10560-1-git-send-email-houpengyang@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/unwind-libunwind.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
index f079b63..4c00507 100644
--- a/tools/perf/util/unwind-libunwind.c
+++ b/tools/perf/util/unwind-libunwind.c
@@ -360,7 +360,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
 		unw_word_t base = is_exec ? 0 : map->start;
 
 		if (fd >= 0)
-			dso__data_put_fd(dso);
+			dso__data_put_fd(map->dso);
 
 		memset(&di, 0, sizeof(di));
 		if (dwarf_find_debug_frame(0, &di, ip, base, map->dso->name,

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-06-18  8:19 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-16 11:16 [PATCH] perf unwind: Fix a compile error Hou Pengyang
2015-06-16 13:47 ` Arnaldo Carvalho de Melo
2015-06-17 11:51   ` Wangnan (F)
2015-06-17 19:35     ` Arnaldo Carvalho de Melo
2015-06-18  8:15 ` [tip:perf/core] " tip-bot for Hou Pengyang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox