ACK: [SRU][X][PATCH 1/1] Revert "perf report: Add warning when libunwind not compiled in"

Stefan Bader stefan.bader at canonical.com
Wed Jan 8 15:09:21 UTC 2020


On 08.01.20 15:59, Kleber Sacilotto de Souza wrote:
> BugLink: https://bugs.launchpad.net/bugs/1858798
> 
> This reverts commit 800d3f561659b5436f8c57e7c26dd1f6928b5615 upstream.
> 
> This commit introduces a build failure in tools/perf on environments
> that don't have libunwind installed.
> 
> [...]
> builtin-report.c: In function ‘report__setup_sample_type’:
> builtin-report.c:289:6: error: ‘dwarf_callchain_users’ undeclared (first
> use in this function)
>   if (dwarf_callchain_users) {
>       ^
> [...]
> 
> The variable 'dwarf_callchain_users' was introduced by eabad8c6856f
> "perf unwind: Do not look just at the global callchain_param.record_mode"
> which as of now hasn't been backported to stable linux-4.4.y. So revert
> this commit to fix the build failure.
> 
> Signed-off-by: Kleber Sacilotto de Souza <kleber.souza at canonical.com>
Acked-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>  tools/perf/builtin-report.c | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
> index 0f7ebac1846b..f256fac1e722 100644
> --- a/tools/perf/builtin-report.c
> +++ b/tools/perf/builtin-report.c
> @@ -285,13 +285,6 @@ static int report__setup_sample_type(struct report *rep)
>  				PERF_SAMPLE_BRANCH_ANY))
>  		rep->nonany_branch_mode = true;
>  
> -#ifndef HAVE_LIBUNWIND_SUPPORT
> -	if (dwarf_callchain_users) {
> -		ui__warning("Please install libunwind development packages "
> -			    "during the perf build.\n");
> -	}
> -#endif
> -
>  	return 0;
>  }
>  
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20200108/6740060d/attachment-0001.sig>


More information about the kernel-team mailing list