diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-13 09:37:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-13 09:37:43 +0200 |
| commit | 7b39cafb7aa68ef8e32a9f51fbe737d96084ca74 (patch) | |
| tree | 14df7e2b8f86af4b0d49e07e722904c7af26d9a2 /tools/include | |
| parent | Merge tag 'perf-core-for-mingo-20160712' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | linux-7b39cafb7aa68ef8e32a9f51fbe737d96084ca74.tar.xz linux-7b39cafb7aa68ef8e32a9f51fbe737d96084ca74.zip | |
tools: Work around BITS_PER_LONG related build failure in objtool
The objtool build fails with the recent changes to the bits-per-long
headers:
tools/include/linux/bitops.h:12:0: error: "BITS_PER_LONG" redefined [-Werror]
Which got introduced by:
bb9707077b4e tools: Copy the bitsperlong.h files from the kernel
Work it around for the time being.
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/linux/bitops.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/include/linux/bitops.h b/tools/include/linux/bitops.h index 5ad9ee1dd7f6..49c929a104ee 100644 --- a/tools/include/linux/bitops.h +++ b/tools/include/linux/bitops.h @@ -9,7 +9,9 @@ #define __WORDSIZE (__SIZEOF_LONG__ * 8) #endif -#define BITS_PER_LONG __WORDSIZE +#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) |