From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S944529AbdDTLHU (ORCPT ); Thu, 20 Apr 2017 07:07:20 -0400 Received: from terminus.zytor.com ([65.50.211.136]:40313 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S942069AbdDTLHS (ORCPT ); Thu, 20 Apr 2017 07:07:18 -0400 Date: Thu, 20 Apr 2017 04:04:58 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: adrian.hunter@intel.com, hpa@zytor.com, dsahern@gmail.com, mingo@kernel.org, wangnan0@huawei.com, acme@redhat.com, jolsa@kernel.org, jpoimboe@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, namhyung@kernel.org Reply-To: acme@redhat.com, mingo@kernel.org, wangnan0@huawei.com, dsahern@gmail.com, hpa@zytor.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, jpoimboe@redhat.com, jolsa@kernel.org, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] objtool: Drop ARRAY_SIZE() definition, tools/include/linux/kernel.h has it now Git-Commit-ID: 0061459744cb985ef31a484bcd9b2fc3cfd01c1b 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: 0061459744cb985ef31a484bcd9b2fc3cfd01c1b Gitweb: http://git.kernel.org/tip/0061459744cb985ef31a484bcd9b2fc3cfd01c1b Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 17 Apr 2017 11:58:55 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 19 Apr 2017 13:01:44 -0300 objtool: Drop ARRAY_SIZE() definition, tools/include/linux/kernel.h has it now And with the goodies present in the kernel.h counterpart, i.e. checking that the parameter is an array at build time. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-roiwxwgwgld4kygn65if60wa@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/objtool/builtin-check.c | 3 +-- tools/objtool/objtool.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c index 066086d..282a603 100644 --- a/tools/objtool/builtin-check.c +++ b/tools/objtool/builtin-check.c @@ -36,8 +36,7 @@ #include "warn.h" #include - -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#include #define STATE_FP_SAVED 0x1 #define STATE_FP_SETUP 0x2 diff --git a/tools/objtool/objtool.c b/tools/objtool/objtool.c index 46c326d..ecc5b1b 100644 --- a/tools/objtool/objtool.c +++ b/tools/objtool/objtool.c @@ -31,11 +31,10 @@ #include #include #include +#include #include "builtin.h" -#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) - struct cmd_struct { const char *name; int (*fn)(int, const char **);