From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754913AbbEOGrs (ORCPT ); Fri, 15 May 2015 02:47:48 -0400 Received: from terminus.zytor.com ([198.137.202.10]:58333 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754890AbbEOGrp (ORCPT ); Fri, 15 May 2015 02:47:45 -0400 Date: Thu, 14 May 2015 23:47:06 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: vlee@twitter.com, bp@suse.de, dsahern@gmail.com, tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, eranian@google.com, namhyung@kernel.org, adrian.hunter@intel.com, fweisbec@gmail.com, mingo@kernel.org, linux-kernel@vger.kernel.org, jolsa@redhat.com, dzickus@redhat.com Reply-To: dzickus@redhat.com, hpa@zytor.com, eranian@google.com, acme@redhat.com, vlee@twitter.com, dsahern@gmail.com, bp@suse.de, tglx@linutronix.de, fweisbec@gmail.com, mingo@kernel.org, jolsa@redhat.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, adrian.hunter@intel.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Fix the build on older distros Git-Commit-ID: c188e7acd24f132279a91f4fe1fb3b078e0329dd X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact 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: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: c188e7acd24f132279a91f4fe1fb3b078e0329dd Gitweb: http://git.kernel.org/tip/c188e7acd24f132279a91f4fe1fb3b078e0329dd Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 14 May 2015 17:39:03 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 14 May 2015 19:27:46 -0300 perf trace: Fix the build on older distros Such as RHEL5, where CLOEXEC, NONBLOCK flags are not present, use a ifdef+define approach instead to make it build on all distros. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Cc: Vinson Lee Link: http://lkml.kernel.org/n/tip-pioazikk9d9oz5qdeor3eldu@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 96a2eba..a05490d 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -16,7 +16,6 @@ #include #include -#include #include #include @@ -41,6 +40,34 @@ # define EFD_SEMAPHORE 1 #endif +#ifndef EFD_NONBLOCK +# define EFD_NONBLOCK 00004000 +#endif + +#ifndef EFD_CLOEXEC +# define EFD_CLOEXEC 02000000 +#endif + +#ifndef O_CLOEXEC +# define O_CLOEXEC 02000000 +#endif + +#ifndef SOCK_DCCP +# define SOCK_DCCP 6 +#endif + +#ifndef SOCK_CLOEXEC +# define SOCK_CLOEXEC 02000000 +#endif + +#ifndef SOCK_NONBLOCK +# define SOCK_NONBLOCK 00004000 +#endif + +#ifndef MSG_CMSG_CLOEXEC +# define MSG_CMSG_CLOEXEC 0x40000000 +#endif + struct tp_field { int offset; union {