Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S964813AbcJVJ4W (ORCPT <rfc822;w@1wt.eu>);
        Sat, 22 Oct 2016 05:56:22 -0400
Received: from mail-wm0-f66.google.com ([74.125.82.66]:33689 "EHLO
        mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S936542AbcJVJ4S (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Sat, 22 Oct 2016 05:56:18 -0400
Subject: Re: [patch] perf_event_open.2: add PERF_SAMPLE_BRANCH_CALL branch
 sample type
To: Vince Weaver <vincent.weaver@maine.edu>
References: <alpine.DEB.2.20.1610211653160.12619@macbook-air>
Cc: mtk.manpages@gmail.com, linux-man@vger.kernel.org,
        linux-kernel@vger.kernel.org, Stephane Eranian <eranian@google.com>,
        Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>
From: "Michael Kerrisk (man-pages)" <mtk.manpages@gmail.com>
Message-ID: <d47dc0f3-ab1a-2271-847d-2b4be4d60c47@gmail.com>
Date: Sat, 22 Oct 2016 11:56:12 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
 Thunderbird/45.2.0
MIME-Version: 1.0
In-Reply-To: <alpine.DEB.2.20.1610211653160.12619@macbook-air>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1345
Lines: 52

Hi Vince,

On 10/21/2016 10:55 PM, Vince Weaver wrote:
> 
> Linux 4.4 (c229bf9dc179d2023e185c0f705bdf68484c1e73) added
> the PERF_SAMPLE_BRANCH_CALL branch sample type, which confusingly
> is a direct-call only subset of what PERF_SAMPLE_BRANCH_ANY_CALL
> provides.

Thanks. Applied.

Cheers,

Michael


> Signed-off-by: Vince Weaver <vincent.weaver@maine.edu>
> 
> diff --git a/man2/perf_event_open.2 b/man2/perf_event_open.2
> index fade28c..8d985b3 100644
> --- a/man2/perf_event_open.2
> +++ b/man2/perf_event_open.2
> @@ -1256,14 +1256,18 @@ following bits must be set.
>  Any branch type.
>  .TP
>  .B PERF_SAMPLE_BRANCH_ANY_CALL
> -Any call branch.
> -.TP
> -.B PERF_SAMPLE_BRANCH_ANY_RETURN
> -Any return branch.
> +Any call branch (includes direct calls, indirect calls, and far jumps).
>  .TP
>  .B PERF_SAMPLE_BRANCH_IND_CALL
>  Indirect calls.
>  .TP
> +.BR PERF_SAMPLE_BRANCH_CALL " (since Linux 4.4)"
> +.\" commit c229bf9dc179d2023e185c0f705bdf68484c1e73
> +Direct calls.
> +.TP
> +.B PERF_SAMPLE_BRANCH_ANY_RETURN
> +Any return branch.
> +.TP
>  .BR PERF_SAMPLE_BRANCH_IND_JUMP " (since Linux 4.2)"
>  .\" commit c9fdfa14c3792c0160849c484e83aa57afd80ccc
>  Indirect jumps.
> 


-- 
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Linux/UNIX System Programming Training: http://man7.org/training/