Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1758571AbcLOP3o (ORCPT <rfc822;w@1wt.eu>);
        Thu, 15 Dec 2016 10:29:44 -0500
Received: from mail.kernel.org ([198.145.29.136]:43334 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1758525AbcLOP3l (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 15 Dec 2016 10:29:41 -0500
Date: Thu, 15 Dec 2016 12:29:27 -0300
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Alexei Starovoitov <ast@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>, Wang Nan <wangnan0@huawei.com>,
        Joe Stringer <joe@ovn.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH] sample/bpf: Make perf_event_read() static
Message-ID: <20161215152927.GC6866@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-Url: http://acmel.wordpress.com
User-Agent: Mutt/1.7.1 (2016-10-04)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1671
Lines: 52


While testing Joe's conversion of samples/bpf/ to use tools/lib/bpf/ I
noticed some warnings, do you guys mind if I put patches like the one
below in my tree, pushing to Ingo soon?

Or is there anything subtle against doing so?


----

While 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'

Shutup the compiler by setting that function as static.

Cc: Alexei Starovoitov <ast@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Wang Nan <wangnan0@huawei.com>,
Cc: Joe Stringer <joe@ovn.org>
Link: http://lkml.kernel.org/n/tip-2wkr4ymwhdie0stbkbiyplt5@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

--

diff --git a/samples/bpf/trace_output_user.c b/samples/bpf/trace_output_user.c
index 3bedd945def1..1a1da7bddb93 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;