]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
x86/headers/uapi: Fix __BITS_PER_LONG value for x32 builds
authorBen Hutchings <ben@decadent.org.uk>
Thu, 1 Oct 2015 00:40:43 +0000 (01:40 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 2 Oct 2015 07:43:21 +0000 (09:43 +0200)
commitf4b4aae1828855db761bf998ce37d3062b1d6446
treee2bf23ffeb061a9949415114a7538c00f4f7605a
parentab76f7b4ab2397ffdd2f1eb07c55697d19991d10
x86/headers/uapi: Fix __BITS_PER_LONG value for x32 builds

On x32, gcc predefines __x86_64__ but long is only 32-bit.  Use
__ILP32__ to distinguish x32.

Fixes this compiler error in perf:

tools/include/asm-generic/bitops/__ffs.h: In function '__ffs':
tools/include/asm-generic/bitops/__ffs.h:19:8: error: right shift count >= width of type [-Werror=shift-count-overflow]
  word >>= 32;
       ^

This isn't sufficient to build perf for x32, though.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/1443660043.2730.15.camel@decadent.org.uk
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/uapi/asm/bitsperlong.h