Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S938717AbcLTT3W (ORCPT <rfc822;w@1wt.eu>);
        Tue, 20 Dec 2016 14:29:22 -0500
Received: from terminus.zytor.com ([198.137.202.10]:36120 "EHLO
        terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S934320AbcLTT3S (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 20 Dec 2016 14:29:18 -0500
Date: Tue, 20 Dec 2016 11:28:39 -0800
From: tip-bot for Arnaldo Carvalho de Melo <tipbot@zytor.com>
Message-ID: <tip-96c2fb69b92fcf6006dfb3017d6d887f8321407b@git.kernel.org>
Cc: arnaldo.melo@gmail.com, hpa@zytor.com, acme@redhat.com,
        daniel@iogearbox.net, tglx@linutronix.de, ast@fb.com, mingo@kernel.org,
        wangnan0@huawei.com, joe@ovn.org, linux-kernel@vger.kernel.org
Reply-To: mingo@kernel.org, ast@fb.com, arnaldo.melo@gmail.com,
        tglx@linutronix.de, daniel@iogearbox.net, hpa@zytor.com,
        acme@redhat.com, linux-kernel@vger.kernel.org, joe@ovn.org,
        wangnan0@huawei.com
In-Reply-To: <20161215152927.GC6866@kernel.org>
References: <20161215152927.GC6866@kernel.org>
To: linux-tip-commits@vger.kernel.org
Subject: [tip:perf/urgent] samples/bpf: Make perf_event_read() static
Git-Commit-ID: 96c2fb69b92fcf6006dfb3017d6d887f8321407b
X-Mailer: tip-git-log-daemon
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2000
Lines: 53

Commit-ID:  96c2fb69b92fcf6006dfb3017d6d887f8321407b
Gitweb:     http://git.kernel.org/tip/96c2fb69b92fcf6006dfb3017d6d887f8321407b
Author:     Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>
AuthorDate: Thu, 15 Dec 2016 12:29:27 -0300
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 20 Dec 2016 09:37:33 -0300

samples/bpf: Make perf_event_read() static

While testing Joe's conversion of samples/bpf/ to use tools/lib/bpf/ I noticed
some warnings building samples/bpf/ on a Fedora Rawhide container, with
clang/llvm 3.9 I noticed this:

  [root@1e797fdfbf4f linux]# make -j4 O=/tmp/build/linux/ samples/bpf/
  make[1]: Entering directory '/tmp/build/linux'
    CHK     include/config/kernel.release
    GEN     ./Makefile
    CHK     include/generated/uapi/linux/version.h
    Using /git/linux as source for kernel
  <SNIP>
    HOSTCC  samples/bpf/trace_output_user.o
  /git/linux/samples/bpf/trace_output_user.c:64:6: warning: no previous
  prototype for 'perf_event_read' [-Wmissing-prototypes]
   void perf_event_read(print_fn fn)
        ^~~~~~~~~~~~~~~
    HOSTLD  samples/bpf/trace_output
  make[1]: Leaving directory '/tmp/build/linux'

Shut up the compiler by making that function static.

Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Joe Stringer <joe@ovn.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20161215152927.GC6866@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 samples/bpf/trace_output_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/bpf/trace_output_user.c b/samples/bpf/trace_output_user.c
index 3bedd94..1a1da7b 100644
--- a/samples/bpf/trace_output_user.c
+++ b/samples/bpf/trace_output_user.c
@@ -61,7 +61,7 @@ struct perf_event_sample {
 	char data[];
 };
 
-void perf_event_read(print_fn fn)
+static void perf_event_read(print_fn fn)
 {
 	__u64 data_tail = header->data_tail;
 	__u64 data_head = header->data_head;