From patchwork Wed May 30 04:49:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 137217 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp4852009lji; Tue, 29 May 2018 21:49:57 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLzK9xABDZREOKKDAfDUdz+WSy9So8aHw0Pv7IX3JyIYNTuZoXL6ygGpD6/TyccD3Ixkbw9 X-Received: by 2002:a65:4c4d:: with SMTP id l13-v6mr1001319pgr.211.1527655797751; Tue, 29 May 2018 21:49:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527655797; cv=none; d=google.com; s=arc-20160816; b=tHJcIQhRiATDnFvIbSbHr/Q9Inq6WnkKp90CARF6g7bdZ12XF/t7BAMLGI86oEeGKZ WcbvGs6939RtLaFBLJt3Zzgj7KhkWWkZnaEjwGrGpSYKc/8i7ozHedueL87qNVhMZOyL V95onkw7nItZg9N3M6MWG5jsOlBDMjXjO1idNjqJSMxkpwjfUW0zj/jGEPGl4tOUQgE/ GTQeL5HnBWC2c30IB9oe7BuG/WxOmAU+ZHMPnCnd7iLVLMsagt97ySOhpfbee8tYj+ZV udGSTHQbPPpBGRLjEYoPcDknGKAy6GnqjsyMHH7p3TRxxLkhRvQLphtGOnlos8IEn09k OLdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=XcWYtj2R67z3Xl1nQgATjkBXlfmSth1+G3LzsqrO+3Y=; b=LXtf0rpqELU2Z14qH1p353npVhaWHSe4C8BszQQ7U0cG2W9k4OaXabFAVKQy026IC7 c8Zi2shyMdIZra60TNC4Wy0oL+FvJeD241LFhpaCRyvg1hfCmNQpy7wWk8odLpaWOGKL 42Jm7ZJaKXbsk6QjDEmjBdDccet1s6O4OZSS0gZcMGIHo3vaZY6HLaERgtJxOkw1pCb1 azqVGOFUT+RxZCX4zUvi+OVAVRTGMzTkjKCR04jR+Mp+GAvgA8VhlbNPnol5h4pbN4b9 8euJncvHeTI3OZXD9Fo5HSSGSK3EFYz7xk010xDMqucJhyG5fmszXInTzcSn4yVdho8J weSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i8g3ooQJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1-v6si33445688plo.20.2018.05.29.21.49.57; Tue, 29 May 2018 21:49:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i8g3ooQJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935420AbeE3Etz (ORCPT + 30 others); Wed, 30 May 2018 00:49:55 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:53059 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750795AbeE3Etw (ORCPT ); Wed, 30 May 2018 00:49:52 -0400 Received: by mail-wm0-f67.google.com with SMTP id 18-v6so39665173wml.2 for ; Tue, 29 May 2018 21:49:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=XcWYtj2R67z3Xl1nQgATjkBXlfmSth1+G3LzsqrO+3Y=; b=i8g3ooQJ4ILGsjYHJQ4w6d/elwUfmSz1Xg5ZetlAXfEhnBZgE6zTe3Wt4/UqFLnjQf Mggb6DjI++wJCHBZiW/aroRQY9mv3VdKp3FNpdVc8zM+k6Vcy15WxHv5P25mkG0xR/qE 5DR7WmzdMCYfhUn0VpsYEcP1nni2ACs73M+a8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=XcWYtj2R67z3Xl1nQgATjkBXlfmSth1+G3LzsqrO+3Y=; b=SuCuzy6ixA2nzvD0RVrTL81HNrLJBb6uN6T4heUq6/sH8yRjrMpk+MT63oBvzjYhjI aAJDxlu0nVGBDFTTSQFAMuxqykWN6ALM1GFHrjY6g/mxbi4y2m29dEffDw2FOcE0upQZ j7CB70y4sn3a8JwA6F4OO+h9dlRpHvMUxxkNTP33R3tzWAuLU4OoVZXGU24izycB1x9P J0oenDwRPbeLiyVczjtC63P2etdugN/rC/bQOSmD51JRnjsyQlmNOrpbuBzcn1k+B5i6 qeZoxqHC4xkaN5Hig8WifW8h+ojw52+/pJ56iCvGX1MXfAmiqzdW9UoDs1VemX7fAIf/ ANwQ== X-Gm-Message-State: APt69E20agGwlj9K4m+QKcrSKthfUYaKFe6zIQQfGUGieMGO+YY06Wg6 aYCgtR3JV6LjLpyoIwt8ekdX9Q== X-Received: by 2002:a1c:d282:: with SMTP id j124-v6mr231951wmg.74.1527655791153; Tue, 29 May 2018 21:49:51 -0700 (PDT) Received: from localhost.localdomain ([45.76.138.171]) by smtp.gmail.com with ESMTPSA id z63-v6sm50421580wrb.34.2018.05.29.21.49.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 May 2018 21:49:49 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-kernel@vger.kernel.org, Mathieu Poirier Cc: Leo Yan Subject: [PATCH] perf hists browser: Fix stale hist_entry__tui_annotate() declaration Date: Wed, 30 May 2018 12:49:27 +0800 Message-Id: <1527655767-12161-1-git-send-email-leo.yan@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since commit 464fb4fd6af7 ("perf hists browser: Pass annotation_options from tool to browser") has added extra parameter for functions, but it missed to update hist_entry__tui_annotate() declaration for !HAVE_SLANG_SUPPORT configuration so this results in regression for perf tool building failure. This patch is to update hist_entry__tui_annotate() declaration for new added argument '*annotation_opts'. Signed-off-by: Leo Yan --- tools/perf/util/hist.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 5f30758..cafafbf 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -460,7 +460,8 @@ static inline int map_symbol__tui_annotate(struct map_symbol *ms __maybe_unused, static inline int hist_entry__tui_annotate(struct hist_entry *he __maybe_unused, struct perf_evsel *evsel __maybe_unused, - struct hist_browser_timer *hbt __maybe_unused) + struct hist_browser_timer *hbt __maybe_unused, + struct annotation_options *annotation_opts __maybe_unused) { return 0; }