From: Alexander Sverdlin <alexander.sverdlin@nokia.com>
To: linux-kernel@vger.kernel.org
Cc: Alexander Sverdlin <alexander.sverdlin@nokia.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH] tools: Remove conflicting BITS_PER_LONG define
Date: Wed, 12 Sep 2018 19:02:32 +0200 [thread overview]
Message-ID: <20180912170232.25258-1-alexander.sverdlin@nokia.com> (raw)
CC .../tools/objtool/builtin-check.o
...
In file included from .../tools/arch/x86/include/uapi/asm/bitsperlong.h:11:0,
from .../tools/include/asm-generic/bitops/__ffs.h:6,
from .../tools/include/asm-generic/bitops.h:16,
from .../tools/include/linux/bitops.h:35,
from .../tools/include/linux/hashtable.h:13,
from elf.h:24,
from check.h:22,
from builtin-check.c:30:
.../tools/include/asm-generic/bitsperlong.h:8:0: error: "BITS_PER_LONG" redefined [-Werror]
#define BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__)
Include <asm/bitsperlong.h> instead as other headers do.
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
---
Seen during x86_64 build. Seems that most of the compilers do not define
__SIZEOF_LONG__, but my does.
tools/include/linux/bitops.h | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/tools/include/linux/bitops.h b/tools/include/linux/bitops.h
index acc704b..4ae5232 100644
--- a/tools/include/linux/bitops.h
+++ b/tools/include/linux/bitops.h
@@ -3,16 +3,13 @@
#define _TOOLS_LINUX_BITOPS_H_
#include <asm/types.h>
+#include <asm/bitsperlong.h>
#include <linux/compiler.h>
#ifndef __WORDSIZE
#define __WORDSIZE (__SIZEOF_LONG__ * 8)
#endif
-#ifndef BITS_PER_LONG
-# define BITS_PER_LONG __WORDSIZE
-#endif
-
#define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG))
#define BIT_WORD(nr) ((nr) / BITS_PER_LONG)
#define BITS_PER_BYTE 8
--
2.4.6
next reply other threads:[~2018-09-12 17:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-12 17:02 Alexander Sverdlin [this message]
2018-09-12 19:01 ` Arnaldo Carvalho de Melo
2018-09-12 19:21 ` Arnaldo Carvalho de Melo
2018-09-19 12:28 ` Alexander Sverdlin
2018-09-19 13:03 ` Arnaldo Carvalho de Melo
2018-09-19 15:25 ` Alexander Sverdlin
2018-09-24 8:33 ` Alexander Sverdlin
2018-09-19 12:16 ` Alexander Sverdlin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180912170232.25258-1-alexander.sverdlin@nokia.com \
--to=alexander.sverdlin@nokia.com \
--cc=acme@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome