From patchwork Mon Aug 21 19:25:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 110589 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1702272qge; Mon, 21 Aug 2017 12:29:14 -0700 (PDT) X-Received: by 10.84.133.133 with SMTP id f5mr20174012plf.134.1503343754748; Mon, 21 Aug 2017 12:29:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503343754; cv=none; d=google.com; s=arc-20160816; b=hJgbDg+JwjOVnB1xrPVm9CEzcUnCE+H/3Jo8eywo+1ldQ/m51pyAPnrwarN3GDOf95 w8YzPxaxOrtkgeZMfoVyZ2K4Fe2zl75X9YtuCYA0kN8EfxPB0SZe+KeA0kxY788RlCLv Ig40apBcitVFDnUwGptQxQy9X+lPyjgXOsZ92COObiAP/3/OkOh++DyTOa6Tog+3PODu nGSbBhu+SHPyrMgNyh5bh+K9ls/Uv8z9L1sLQ8374gB81hg6CxVGW/L+u6T1ZzLqq1dy /MJzlRcEV/NEVGo6K5rCMsiJGzzlgcRbQXrm+R+H/MSNWvaST+sGeOvaUO6jNVszQBIa 63cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dmarc-filter:arc-authentication-results; bh=tUvOlQmAPaMKphj48rYS6gNfuzXsU3Cl9/C/UGL0brE=; b=fYL9IHJoCucN6Pw5mhKX+R13+NSIxZ6JelKP6EFn15FaLo0eisutaxe5xtjwUySZlC +WDhNOqBvzW+gzBIRooE0PUuDNSCwCBZVFKizqX9S0jXE+7RcYdiv2plqU8KqOJV3i+y AME644+MjnTABc1/elYR3IYO1FIsG6uC3D6JyRc3Jj5Nn4dXzY2fOMdYLsrbgzzJ5iaV zQ/V2/c9E4xq++lWAsFWHLuYlDwwK5tBW5nLTSDKjFEyL6Pn43XLU3QLEob/jz1P0wvD 3cEC0h3bJJRBNKPfcknHwf1hzqAVx09gbnJCLu9VPmWo/YMuMrJ5RXPMGcTdiVLCjN23 maPQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r80si7734691pfi.566.2017.08.21.12.29.14; Mon, 21 Aug 2017 12:29:14 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932100AbdHUT3L (ORCPT + 26 others); Mon, 21 Aug 2017 15:29:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:34948 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753823AbdHUT0C (ORCPT ); Mon, 21 Aug 2017 15:26:02 -0400 Received: from jouet.infradead.org (unknown [179.97.41.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C9CB121A28; Mon, 21 Aug 2017 19:25:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9CB121A28 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=acme@kernel.org From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, =?utf-8?q?Daniel_D=C3=ADaz?= , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 01/13] tools lib bpf: Fix double file test in Makefile Date: Mon, 21 Aug 2017 16:25:37 -0300 Message-Id: <20170821192549.17251-2-acme@kernel.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170821192549.17251-1-acme@kernel.org> References: <20170821192549.17251-1-acme@kernel.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Díaz The Makefile verifies the same file exists twice: test -f ../../../include/uapi/linux/bpf.h -a \ -f ../../../include/uapi/linux/bpf.h The purpose of the check is to ensure the diff (immediately after the test) doesn't fail with these two files: tools/include/uapi/linux/bpf.h include/uapi/linux/bpf.h Same recipe for bpf_common: test -f ../../../include/uapi/linux/bpf_common.h -a \ -f ../../../include/uapi/linux/bpf_common.h This corrects the location of the tests. Signed-off-by: Daniel Díaz Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1502814810-960-1-git-send-email-daniel.diaz@linaro.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/bpf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.13.5 diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index e87b5903f4bb..4ed0257dc1f3 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -154,10 +154,10 @@ all: fixdep $(VERSION_FILES) all_cmd all_cmd: $(CMD_TARGETS) $(BPF_IN): force elfdep bpfdep - @(test -f ../../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \ + @(test -f ../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \ (diff -B ../../include/uapi/linux/bpf.h ../../../include/uapi/linux/bpf.h >/dev/null) || \ echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h'" >&2 )) || true - @(test -f ../../../include/uapi/linux/bpf_common.h -a -f ../../../include/uapi/linux/bpf_common.h && ( \ + @(test -f ../../include/uapi/linux/bpf_common.h -a -f ../../../include/uapi/linux/bpf_common.h && ( \ (diff -B ../../include/uapi/linux/bpf_common.h ../../../include/uapi/linux/bpf_common.h >/dev/null) || \ echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf_common.h' differs from latest version at 'include/uapi/linux/bpf_common.h'" >&2 )) || true $(Q)$(MAKE) $(build)=libbpf