summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2017-04-17 12:01:36 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-06-05 10:28:57 +0200
commitc5e64da62affbd9796ca801e92bfabe3a03fdccc (patch)
treebf8aba00367b7a2d04fbe12a00942cdd3bd53cda
parent110cf308d24a6b7ec27852a4d0933bfe00f551c9 (diff)
downloadlinux-stable-c5e64da62affbd9796ca801e92bfabe3a03fdccc.tar.gz
linux-stable-c5e64da62affbd9796ca801e92bfabe3a03fdccc.tar.bz2
linux-stable-c5e64da62affbd9796ca801e92bfabe3a03fdccc.zip
tools include: Drop ARRAY_SIZE() definition from linux/hashtable.h
commit 68289cbd83eaa20faef7cc818121bc8e769065de upstream. As tools/include/linux/kernel.h has it now, with the goodies present in the kernel.h counterpart, i.e. checking that the parameter is an array at build time. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/n/tip-v0b41ivu6z6dyugbq9ffa9ez@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--tools/include/linux/hashtable.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/include/linux/hashtable.h b/tools/include/linux/hashtable.h
index c65cc0aa2659..251eabf2a05e 100644
--- a/tools/include/linux/hashtable.h
+++ b/tools/include/linux/hashtable.h
@@ -13,10 +13,6 @@
#include <linux/hash.h>
#include <linux/log2.h>
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#endif
-
#define DEFINE_HASHTABLE(name, bits) \
struct hlist_head name[1 << (bits)] = \
{ [0 ... ((1 << (bits)) - 1)] = HLIST_HEAD_INIT }